diff options
| author | lain <lain@soykaf.club> | 2019-12-05 17:16:23 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-05 17:16:23 +0000 |
| commit | 67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (patch) | |
| tree | 4fc937160ad56b81bd11b17e4a97a7a6255bd6e6 /test/web/twitter_api/util_controller_test.exs | |
| parent | d0bd4348b34075e1d9ed6905255c85c452e0b4ca (diff) | |
| parent | d3bce89edddf72e2eb78e7c84a93c5bd4b6c8ff8 (diff) | |
| download | pleroma-67d8df04a440ec9b2949bdddd3a3d8dd70c9b140.tar.gz pleroma-67d8df04a440ec9b2949bdddd3a3d8dd70c9b140.zip | |
Merge branch '1335-user-api-id-fields-relations' into 'develop'
[#1335] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
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 |