diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
| commit | cdff5b82670313e46c2b362d4cf041779af6a6bd (patch) | |
| tree | edc39a1b48f48334480e709fbda844cb120b32f8 /test/web/twitter_api/util_controller_test.exs | |
| parent | 9f99640cfc81f28c0b6cdb5f6ef065b3e46f5f23 (diff) | |
| parent | 67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (diff) | |
| download | pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.tar.gz pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.zip | |
Merge branch 'develop' into fix/mrf-delete
Diffstat (limited to 'test/web/twitter_api/util_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/util_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs index f0211f59c..986ee01f3 100644 --- a/test/web/twitter_api/util_controller_test.exs +++ b/test/web/twitter_api/util_controller_test.exs @@ -387,7 +387,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do user = insert(:user) user2 = insert(:user) - {:ok, _user} = Pleroma.User.block(user2, user) + {:ok, _user_block} = Pleroma.User.block(user2, user) response = conn @@ -485,7 +485,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do Pleroma.Config.put([:user, :deny_follow_blocked], true) user = insert(:user) user2 = insert(:user) - {:ok, _user} = Pleroma.User.block(user2, user) + {:ok, _user_block} = Pleroma.User.block(user2, user) response = conn |