diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-09 09:08:59 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-09 09:08:59 -0500 |
| commit | 49c4e2495357797caa82b4eb0a4d03e8c8dd2730 (patch) | |
| tree | 7295ba98c7833534622a9c7fb27580691fbc06a5 /test/web/activity_pub/utils_test.exs | |
| parent | da4029391d217b1e2c151e69479de42e2221e02f (diff) | |
| parent | 8ca1f3e8c61b906387e9cb6fb8993d2ad496ab3d (diff) | |
| download | pleroma-49c4e2495357797caa82b4eb0a4d03e8c8dd2730.tar.gz pleroma-49c4e2495357797caa82b4eb0a4d03e8c8dd2730.zip | |
Merge branch 'develop' into fix/csp-for-captcha
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 |