summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-12 05:59:12 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-12 05:59:12 +0000
commitfe4387077ad8845ef74c49338b7f492475697591 (patch)
treedf8d217073d32d88502904c7f2d68b73e5a5a3f3 /test
parent4a922305afb9b445d11522be73428f10a7d1fc19 (diff)
parent32211c4ada3ea113fb4041ae28b884130b2f4342 (diff)
downloadpleroma-fe4387077ad8845ef74c49338b7f492475697591.tar.gz
pleroma-fe4387077ad8845ef74c49338b7f492475697591.zip
Merge branch 'feature/default-scope' into 'develop'
default scope setting See merge request pleroma/pleroma!239
Diffstat (limited to 'test')
-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)