summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/activity_pub_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-12-06 13:48:37 +0000
committerlain <lain@soykaf.club>2019-12-06 13:48:37 +0000
commita280be34e36223aefd3d5e26fcddb9faad77310b (patch)
treeedc39a1b48f48334480e709fbda844cb120b32f8 /test/web/activity_pub/activity_pub_controller_test.exs
parent67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (diff)
parentcdff5b82670313e46c2b362d4cf041779af6a6bd (diff)
downloadpleroma-a280be34e36223aefd3d5e26fcddb9faad77310b.tar.gz
pleroma-a280be34e36223aefd3d5e26fcddb9faad77310b.zip
Merge branch 'fix/mrf-delete' into 'develop'
ActivityPub: Fix deletes being exempt from MRF Closes #1461 See merge request pleroma/pleroma!2037
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