diff options
| author | squidboi <squidboi@waifu.club> | 2018-06-16 15:37:16 -0700 |
|---|---|---|
| committer | squidboi <squidboi@waifu.club> | 2018-06-16 15:37:16 -0700 |
| commit | 2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb (patch) | |
| tree | 740d660abc0ca455368144abc89c8a398e85caf0 /test/web/twitter_api/views | |
| parent | 4f9ecfc77a54eef23741c89206b4cbce924f7d76 (diff) | |
| parent | 1ea4a18ad859600841860cdd1a981da868aa18a0 (diff) | |
| download | pleroma-2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb.tar.gz pleroma-2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb.zip | |
Merge branch 'develop' into feature/configurable-blocks
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) |