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/common_api/common_api_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/common_api/common_api_test.exs')
| -rw-r--r-- | test/web/common_api/common_api_test.exs | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 908ee5484..7e11fede3 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_test.exs @@ -934,6 +934,15 @@ defmodule Pleroma.Web.CommonAPITest do end end + describe "follow/2" do + test "directly follows a non-locked local user" do + [follower, followed] = insert_pair(:user) + {:ok, follower, followed, _} = CommonAPI.follow(follower, followed) + + assert User.following?(follower, followed) + end + end + describe "unfollow/2" do test "also unsubscribes a user" do [follower, followed] = insert_pair(:user) @@ -998,9 +1007,9 @@ defmodule Pleroma.Web.CommonAPITest do follower = insert(:user) follower_two = insert(:user) - {:ok, follow_activity} = ActivityPub.follow(follower, user) - {:ok, follow_activity_two} = ActivityPub.follow(follower, user) - {:ok, follow_activity_three} = ActivityPub.follow(follower_two, user) + {:ok, _, _, follow_activity} = CommonAPI.follow(follower, user) + {:ok, _, _, follow_activity_two} = CommonAPI.follow(follower, user) + {:ok, _, _, follow_activity_three} = CommonAPI.follow(follower_two, user) assert follow_activity.data["state"] == "pending" assert follow_activity_two.data["state"] == "pending" @@ -1018,9 +1027,9 @@ defmodule Pleroma.Web.CommonAPITest do follower = insert(:user) follower_two = insert(:user) - {:ok, follow_activity} = ActivityPub.follow(follower, user) - {:ok, follow_activity_two} = ActivityPub.follow(follower, user) - {:ok, follow_activity_three} = ActivityPub.follow(follower_two, user) + {:ok, _, _, follow_activity} = CommonAPI.follow(follower, user) + {:ok, _, _, follow_activity_two} = CommonAPI.follow(follower, user) + {:ok, _, _, follow_activity_three} = CommonAPI.follow(follower_two, user) assert follow_activity.data["state"] == "pending" assert follow_activity_two.data["state"] == "pending" |