diff options
| author | lain <lain@soykaf.club> | 2018-06-02 15:39:21 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-06-02 15:39:21 +0200 |
| commit | da9cbf2c05124377586f370cb716943211f51052 (patch) | |
| tree | 82ccc8ee824b64851867af89227d8421a1da1dd4 /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 5e76adb07e225a1f5934b44ad474158dfcd52233 (diff) | |
| parent | dca1d6d16278599485df3a175fb356bdc995441c (diff) | |
| download | pleroma-da9cbf2c05124377586f370cb716943211f51052.tar.gz pleroma-da9cbf2c05124377586f370cb716943211f51052.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
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?( |