diff options
| author | dtluna <dtluna@openmailbox.org> | 2017-04-13 15:36:00 +0300 |
|---|---|---|
| committer | dtluna <dtluna@openmailbox.org> | 2017-04-13 15:36:00 +0300 |
| commit | a8e50d602ba25b2062e0e676e1dd115da64c2565 (patch) | |
| tree | 4921704448e03286876255b0aa0b46badf58e586 /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 65ef18a7157f8cfcc494ad7a72ce083e79e38d26 (diff) | |
| parent | d2bf099ae66b7332128c854f322bb8a00eb62212 (diff) | |
| download | pleroma-a8e50d602ba25b2062e0e676e1dd115da64c2565.tar.gz pleroma-a8e50d602ba25b2062e0e676e1dd115da64c2565.zip | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 4 |
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 |