diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-09 10:32:24 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-09 10:32:24 +0000 |
| commit | 68036f5a3b7b609f4464650c2ae40b9679d45291 (patch) | |
| tree | 25e0f0f372ea0f77719bb253dee13a4cd831de54 /test/web/activity_pub/utils_test.exs | |
| parent | 34d6009d82ef8949d689ed1f7c4ec2c2fad254c7 (diff) | |
| parent | 00e54f8fe7af098ba829f7f7cd5511569dcd1c0a (diff) | |
| download | pleroma-68036f5a3b7b609f4464650c2ae40b9679d45291.tar.gz pleroma-68036f5a3b7b609f4464650c2ae40b9679d45291.zip | |
Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
Diffstat (limited to 'test/web/activity_pub/utils_test.exs')
| -rw-r--r-- | test/web/activity_pub/utils_test.exs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/web/activity_pub/utils_test.exs b/test/web/activity_pub/utils_test.exs index 2f9ecb5a3..361dc5a41 100644 --- a/test/web/activity_pub/utils_test.exs +++ b/test/web/activity_pub/utils_test.exs @@ -8,7 +8,6 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User - alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.AdminAPI.AccountView alias Pleroma.Web.CommonAPI @@ -197,8 +196,8 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do user = insert(:user, locked: true) follower = insert(:user) - {:ok, follow_activity} = ActivityPub.follow(follower, user) - {:ok, follow_activity_two} = ActivityPub.follow(follower, user) + {:ok, _, _, follow_activity} = CommonAPI.follow(follower, user) + {:ok, _, _, follow_activity_two} = CommonAPI.follow(follower, user) data = follow_activity_two.data @@ -221,8 +220,8 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do user = insert(:user, locked: true) follower = insert(:user) - {:ok, follow_activity} = ActivityPub.follow(follower, user) - {:ok, follow_activity_two} = ActivityPub.follow(follower, user) + {:ok, _, _, follow_activity} = CommonAPI.follow(follower, user) + {:ok, _, _, follow_activity_two} = CommonAPI.follow(follower, user) data = follow_activity_two.data |