aboutsummaryrefslogtreecommitdiff
path: root/test/web/twitter_api/util_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-08 20:14:28 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-08 20:14:28 +0300
commit6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9 (patch)
tree6b8e22663fd5b6d5cdf3afaa4b306775d59b503a /test/web/twitter_api/util_controller_test.exs
parent49bb0a130f93476d32d3177d7a989b7a98a063f2 (diff)
parentaf5fef1f228a1781d7d9cad490d3b3a783389f5e (diff)
downloadpleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.tar.gz
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/twitter_api/util_controller_test.exs')
-rw-r--r--test/web/twitter_api/util_controller_test.exs4
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