projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
[akkoma]
/
test
/
web
/
twitter_api
/
twitter_api_controller_test.exs
diff --git
a/test/web/twitter_api/twitter_api_controller_test.exs
b/test/web/twitter_api/twitter_api_controller_test.exs
index 73443e053a6c7e87c0bf4ca1c234305e30947501..03e5824a9872a89daaa87403befb79f8815b5226 100644
(file)
--- a/
test/web/twitter_api/twitter_api_controller_test.exs
+++ b/
test/web/twitter_api/twitter_api_controller_test.exs
@@
-444,7
+444,7
@@
defmodule Pleroma.Web.TwitterAPI.ControllerTest do
test "with credentials", %{conn: conn, user: current_user} do
blocked = insert(:user)
test "with credentials", %{conn: conn, user: current_user} do
blocked = insert(:user)
- {:ok, current_user
} = User.block(current_user, blocked
)
+ {:ok, current_user
, blocked} = TwitterAPI.block(current_user, %{"user_id" => blocked.id}
)
assert User.blocks?(current_user, blocked)
conn =
assert User.blocks?(current_user, blocked)
conn =
@@
-668,6
+668,7
@@
defmodule Pleroma.Web.TwitterAPI.ControllerTest do
conn =
conn
conn =
conn
+ |> assign(:user, user)
|> get("/api/statuses/friends", %{"user_id" => user.id})
assert MapSet.equal?(
|> get("/api/statuses/friends", %{"user_id" => user.id})
assert MapSet.equal?(
@@
-689,6
+690,7
@@
defmodule Pleroma.Web.TwitterAPI.ControllerTest do
conn =
conn
conn =
conn
+ |> assign(:user, user)
|> get("/api/statuses/friends", %{"screen_name" => user.nickname})
assert MapSet.equal?(
|> get("/api/statuses/friends", %{"screen_name" => user.nickname})
assert MapSet.equal?(