summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/activity_pub_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-08 20:14:28 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-08 20:14:28 +0300
commit6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9 (patch)
tree6b8e22663fd5b6d5cdf3afaa4b306775d59b503a /test/web/activity_pub/activity_pub_controller_test.exs
parent49bb0a130f93476d32d3177d7a989b7a98a063f2 (diff)
parentaf5fef1f228a1781d7d9cad490d3b3a783389f5e (diff)
downloadpleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.tar.gz
pleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
-rw-r--r--test/web/activity_pub/activity_pub_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index 1aa73d75c..ba2ce1dd9 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -298,7 +298,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert json_response(conn1, :ok)
assert Enum.any?(conn1.resp_headers, &(&1 == {"x-cache", "MISS from Pleroma"}))
- Activity.delete_by_ap_id(activity.object.data["id"])
+ Activity.delete_all_by_object_ap_id(activity.object.data["id"])
conn2 =
conn