diff options
| author | lain <lain@soykaf.club> | 2019-06-04 14:58:13 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-04 14:58:13 +0000 |
| commit | f178a6f3f0d152a5e75c82da08195ee2d7fd3612 (patch) | |
| tree | 3adf7ccf852cf4f4f12804a5f4427583905e17b7 /test/web/twitter_api/views | |
| parent | 0eb7464c10df109e8aacf734bb092f69192ab5c2 (diff) | |
| parent | 1e7bb69a957c279eb75ed72cca779caa9d8f25ce (diff) | |
| download | pleroma-f178a6f3f0d152a5e75c82da08195ee2d7fd3612.tar.gz pleroma-f178a6f3f0d152a5e75c82da08195ee2d7fd3612.zip | |
Merge branch 'issue/941' into 'develop'
[#941] add option skip_thread_containment
See merge request pleroma/pleroma!1237
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 a48fc9b78..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" @@ -154,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" @@ -199,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" @@ -281,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" |