summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/twitter_api_controller_test.exs
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-13 15:18:18 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-13 15:18:18 +0300
commit3ff917b5dd72bc44f84a8f08cfc368faf28199f0 (patch)
tree2bb558af2ee2a8b4ad23211f8f3ad5d7ca8a5421 /test/web/twitter_api/twitter_api_controller_test.exs
parent896e40cd2bbd064548a1a9cb730f79d793e6d6f5 (diff)
parentd2bf099ae66b7332128c854f322bb8a00eb62212 (diff)
downloadpleroma-3ff917b5dd72bc44f84a8f08cfc368faf28199f0.tar.gz
pleroma-3ff917b5dd72bc44f84a8f08cfc368faf28199f0.zip
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 5aad12593..7c75ff757 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -127,7 +127,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
current_user = Repo.get(User, current_user.id)
assert current_user.following == [User.ap_followers(followed)]
- assert json_response(conn, 200) == UserRepresenter.to_map(followed)
+ assert json_response(conn, 200) == UserRepresenter.to_map(followed, %{for: current_user})
end
end
@@ -150,7 +150,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
current_user = Repo.get(User, current_user.id)
assert current_user.following == []
- assert json_response(conn, 200) == UserRepresenter.to_map(followed)
+ assert json_response(conn, 200) == UserRepresenter.to_map(followed, %{for: current_user})
end
end