diff options
author | Roger Braun <roger@rogerbraun.net> | 2018-02-02 17:14:58 +0100 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2018-02-02 17:14:58 +0100 |
commit | 9a9766d6489024fb725197af1461944252aae9ed (patch) | |
tree | 12710d5e5195cd8be0ef388d7750157a21b1fecd /test/web/twitter_api | |
parent | 2203fa2fdb202d28c3ad92121fe9b94de7dbba76 (diff) | |
parent | 3163311098ddaa0ca8b40be3fedfcf7631119ad5 (diff) | |
download | pleroma-9a9766d6489024fb725197af1461944252aae9ed.tar.gz pleroma-9a9766d6489024fb725197af1461944252aae9ed.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'test/web/twitter_api')
-rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index 3f84e4116..e68230a86 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -56,7 +56,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "rights" => %{}, "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, - "background_image" => nil + "background_image" => nil, + "is_local" => true } assert represented == UserView.render("show.json", %{user: user}) @@ -88,7 +89,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "rights" => %{}, "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, - "background_image" => nil + "background_image" => nil, + "is_local" => true } assert represented == UserView.render("show.json", %{user: user, for: follower}) @@ -121,7 +123,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "rights" => %{}, "statusnet_profile_url" => follower.ap_id, "cover_photo" => banner, - "background_image" => nil + "background_image" => nil, + "is_local" => true } assert represented == UserView.render("show.json", %{user: follower, for: user}) @@ -154,7 +157,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "rights" => %{}, "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, - "background_image" => nil + "background_image" => nil, + "is_local" => true } blocker = Repo.get(User, blocker.id) |