diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-12-10 16:54:25 +0000 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-12-10 16:54:25 +0000 |
| commit | 8cfaab8f04cae6fcc20a37cdb463ee0c93b71217 (patch) | |
| tree | 5ea3e43a73796f264508b583051f6f2143071f00 /test/web/activity_pub/activity_pub_controller_test.exs | |
| parent | 5abee19b63aa1577f8895b48ae69f0a51edb4dc3 (diff) | |
| parent | aac0187ec13078d2756db1671e644d6eb9c0947b (diff) | |
| download | pleroma-8cfaab8f04cae6fcc20a37cdb463ee0c93b71217.tar.gz pleroma-8cfaab8f04cae6fcc20a37cdb463ee0c93b71217.zip | |
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
| -rw-r--r-- | test/web/activity_pub/activity_pub_controller_test.exs | 2 |
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 |