diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-12 07:18:19 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-12 07:18:19 +0000 |
| commit | a6e0c31518ff60bd5e147941446779d719afaeb2 (patch) | |
| tree | 2423dd88f39ecc8349203102b3b403d7e6614305 /test/web/twitter_api/views | |
| parent | 01240fd8b6654f74aa7273fa624e927870629fa0 (diff) | |
| parent | 98104712379f4d001fc633eed7cfab69224816bc (diff) | |
| download | pleroma-a6e0c31518ff60bd5e147941446779d719afaeb2.tar.gz pleroma-a6e0c31518ff60bd5e147941446779d719afaeb2.zip | |
Merge branch 'feature/locked-accounts-part-1' into 'develop'
locked accounts
See merge request pleroma/pleroma!180
Diffstat (limited to 'test/web/twitter_api/views')
| -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 9f8bf4cdc..eea743b32 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -59,7 +59,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, "background_image" => nil, - "is_local" => true + "is_local" => true, + "locked" => false } assert represented == UserView.render("show.json", %{user: user}) @@ -94,7 +95,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, "background_image" => nil, - "is_local" => true + "is_local" => true, + "locked" => false } assert represented == UserView.render("show.json", %{user: user, for: follower}) @@ -130,7 +132,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "statusnet_profile_url" => follower.ap_id, "cover_photo" => banner, "background_image" => nil, - "is_local" => true + "is_local" => true, + "locked" => false } assert represented == UserView.render("show.json", %{user: follower, for: user}) @@ -173,7 +176,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, "background_image" => nil, - "is_local" => true + "is_local" => true, + "locked" => false } blocker = Repo.get(User, blocker.id) |