diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
| commit | ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38 (patch) | |
| tree | b397d1192c69a7d089c86d41b6e09e89954ea798 /test/web/twitter_api/views/user_view_test.exs | |
| parent | e912f81c828cc7e1d2c0dff8daed3ad52f407a61 (diff) | |
| parent | 03bcb40883dafa2886110e2b625c4cc5c21106f1 (diff) | |
| download | pleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.tar.gz pleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.zip | |
Merge branch 'develop' into feature/matstodon-statuses-by-name
Diffstat (limited to 'test/web/twitter_api/views/user_view_test.exs')
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 14 |
1 files changed, 10 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 74526673c..70c5a0b7f 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -99,7 +99,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "fields" => [], "pleroma" => %{ "confirmation_pending" => false, - "tags" => [] + "tags" => [], + "skip_thread_containment" => false }, "rights" => %{"admin" => false, "delete_others_notice" => false}, "role" => "member" @@ -112,9 +113,11 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do as_user = UserView.render("show.json", %{user: user, for: user}) assert as_user["default_scope"] == user.info.default_scope assert as_user["no_rich_text"] == user.info.no_rich_text + assert as_user["pleroma"]["notification_settings"] == user.info.notification_settings as_stranger = UserView.render("show.json", %{user: user}) refute as_stranger["default_scope"] refute as_stranger["no_rich_text"] + refute as_stranger["pleroma"]["notification_settings"] end test "A user for a given other follower", %{user: user} do @@ -152,7 +155,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "fields" => [], "pleroma" => %{ "confirmation_pending" => false, - "tags" => [] + "tags" => [], + "skip_thread_containment" => false }, "rights" => %{"admin" => false, "delete_others_notice" => false}, "role" => "member" @@ -197,7 +201,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "fields" => [], "pleroma" => %{ "confirmation_pending" => false, - "tags" => [] + "tags" => [], + "skip_thread_containment" => false }, "rights" => %{"admin" => false, "delete_others_notice" => false}, "role" => "member" @@ -279,7 +284,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "fields" => [], "pleroma" => %{ "confirmation_pending" => false, - "tags" => [] + "tags" => [], + "skip_thread_containment" => false }, "rights" => %{"admin" => false, "delete_others_notice" => false}, "role" => "member" |