summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/views/user_view_test.exs
diff options
context:
space:
mode:
authorTristan Mahé <gled@remote-shell.net>2018-07-13 11:14:37 -0700
committerTristan Mahé <gled@remote-shell.net>2018-07-13 11:14:37 -0700
commit5469fb9561bb886deb8434e545dfb711eb20f341 (patch)
tree78ab675afd6169e2497b5c47882725cc1d2f2326 /test/web/twitter_api/views/user_view_test.exs
parentc06a5af386a3cdfeda0b2c21963d9200fb7d6c89 (diff)
parentd93789dfde3c44c76a56732088a897ddddfe9716 (diff)
downloadpleroma-5469fb9561bb886deb8434e545dfb711eb20f341.tar.gz
pleroma-5469fb9561bb886deb8434e545dfb711eb20f341.zip
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
Diffstat (limited to 'test/web/twitter_api/views/user_view_test.exs')
-rw-r--r--test/web/twitter_api/views/user_view_test.exs12
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 eea743b32..49f73c2fe 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -60,7 +60,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"cover_photo" => banner,
"background_image" => nil,
"is_local" => true,
- "locked" => false
+ "locked" => false,
+ "default_scope" => "public"
}
assert represented == UserView.render("show.json", %{user: user})
@@ -96,7 +97,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"cover_photo" => banner,
"background_image" => nil,
"is_local" => true,
- "locked" => false
+ "locked" => false,
+ "default_scope" => "public"
}
assert represented == UserView.render("show.json", %{user: user, for: follower})
@@ -133,7 +135,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"cover_photo" => banner,
"background_image" => nil,
"is_local" => true,
- "locked" => false
+ "locked" => false,
+ "default_scope" => "public"
}
assert represented == UserView.render("show.json", %{user: follower, for: user})
@@ -177,7 +180,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"cover_photo" => banner,
"background_image" => nil,
"is_local" => true,
- "locked" => false
+ "locked" => false,
+ "default_scope" => "public"
}
blocker = Repo.get(User, blocker.id)