projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
[akkoma]
/
test
/
web
/
twitter_api
/
util_controller_test.exs
diff --git
a/test/web/twitter_api/util_controller_test.exs
b/test/web/twitter_api/util_controller_test.exs
index f0211f59c64e4f5681ac7c4ed1cb3462b7386a9a..986ee01f35ecb850f9493045942b4e28873d8e68 100644
(file)
--- 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)
user = insert(:user)
user2 = insert(:user)
- {:ok, _user} = Pleroma.User.block(user2, user)
+ {:ok, _user
_block
} = Pleroma.User.block(user2, user)
response =
conn
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)
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
response =
conn