diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-02 16:22:21 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-02 16:22:21 +0000 |
| commit | 019a192e43c2421c74e5126e753aac095db8ad54 (patch) | |
| tree | 3415b92ed0cb9e59f39946a1439fd918c6ea07ee /test/web/mastodon_api/controllers/follow_request_controller_test.exs | |
| parent | 3b15a0eecc62f79465620a697f12b576ed87b0fc (diff) | |
| parent | 04f23294d327f044a72ecd3f269846c2f6198cf1 (diff) | |
| download | pleroma-019a192e43c2421c74e5126e753aac095db8ad54.tar.gz pleroma-019a192e43c2421c74e5126e753aac095db8ad54.zip | |
Merge branch 'release/2.0.3' into 'stable'
Release/2.0.3
See merge request pleroma/secteam/pleroma!3
Diffstat (limited to 'test/web/mastodon_api/controllers/follow_request_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/follow_request_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/controllers/follow_request_controller_test.exs b/test/web/mastodon_api/controllers/follow_request_controller_test.exs index dd848821a..d8dbe4800 100644 --- a/test/web/mastodon_api/controllers/follow_request_controller_test.exs +++ b/test/web/mastodon_api/controllers/follow_request_controller_test.exs @@ -21,7 +21,7 @@ defmodule Pleroma.Web.MastodonAPI.FollowRequestControllerTest do other_user = insert(:user) {:ok, _activity} = ActivityPub.follow(other_user, user) - {:ok, other_user} = User.follow(other_user, user, "pending") + {:ok, other_user} = User.follow(other_user, user, :follow_pending) assert User.following?(other_user, user) == false @@ -35,7 +35,7 @@ defmodule Pleroma.Web.MastodonAPI.FollowRequestControllerTest do other_user = insert(:user) {:ok, _activity} = ActivityPub.follow(other_user, user) - {:ok, other_user} = User.follow(other_user, user, "pending") + {:ok, other_user} = User.follow(other_user, user, :follow_pending) user = User.get_cached_by_id(user.id) other_user = User.get_cached_by_id(other_user.id) |