diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-01 08:51:04 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-01 08:51:04 +0000 |
| commit | 98b8f087832a793fa1b56d26acfec46360e73d00 (patch) | |
| tree | aba2f5c49f1b77ef8af5940246ca8db78d22e65a /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 349400c06afc1efeee61bbbf3469ac5d98607621 (diff) | |
| parent | 935e544e19a2dde70a5e1cc9d8fdc1cf49da8517 (diff) | |
| download | pleroma-98b8f087832a793fa1b56d26acfec46360e73d00.tar.gz | |
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index c2ea41aa3..03e5824a9 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -668,6 +668,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do conn = conn + |> assign(:user, user) |> get("/api/statuses/friends", %{"user_id" => user.id}) assert MapSet.equal?( @@ -689,6 +690,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do conn = conn + |> assign(:user, user) |> get("/api/statuses/friends", %{"screen_name" => user.nickname}) assert MapSet.equal?( |