diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-13 14:12:51 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-13 14:12:51 +0400 |
| commit | dc8fa04192cc133749e762b78ec043e0902d046d (patch) | |
| tree | 06e827fb1f4ef95f266ac98f4ca0f23eaf3aea8c /test/web/mastodon_api | |
| parent | dd612f86ae85248062159d3d21f4a98cd3b4d65e (diff) | |
| parent | 7ee35eb9a6a55ef610eb02a04a33f67e5921cff3 (diff) | |
| download | pleroma-dc8fa04192cc133749e762b78ec043e0902d046d.tar.gz pleroma-dc8fa04192cc133749e762b78ec043e0902d046d.zip | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/web/mastodon_api')
| -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) |