summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-11-26 18:32:31 +0000
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-11-26 18:32:31 +0000
commit0c79869932fe00fe134979a1388dcd666aa0a076 (patch)
tree208feb1aaf11f755136a5ae44e0ea1239dedfeca
parentc5a7b8ad98257f8a00134dabe9f522e809719842 (diff)
fix relationship view tests
-rw-r--r--test/web/mastodon_api/views/.account_view_test.exs.swpbin0 -> 36864 bytes
-rw-r--r--test/web/mastodon_api/views/account_view_test.exs5
2 files changed, 5 insertions, 0 deletions
diff --git a/test/web/mastodon_api/views/.account_view_test.exs.swp b/test/web/mastodon_api/views/.account_view_test.exs.swp
new file mode 100644
index 000000000..5b4f858d7
--- /dev/null
+++ b/test/web/mastodon_api/views/.account_view_test.exs.swp
Binary files differ
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs
index af88841ed..e35fa5fa6 100644
--- a/test/web/mastodon_api/views/account_view_test.exs
+++ b/test/web/mastodon_api/views/account_view_test.exs
@@ -193,6 +193,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
{:ok, other_user} = User.subscribe(user, other_user)
{:ok, user} = User.mute(user, other_user, true)
{:ok, user} = CommonAPI.hide_reblogs(user, other_user)
+ {:ok, user} = User.whitelist(user, other_user)
expected = %{
id: to_string(other_user.id),
@@ -206,6 +207,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
requested: false,
domain_blocking: false,
showing_reblogs: false,
+ whitelisting: true,
endorsed: false
}
@@ -234,6 +236,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
requested: false,
domain_blocking: false,
showing_reblogs: true,
+ whitelisting: false,
endorsed: false
}
@@ -271,6 +274,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
requested: true,
domain_blocking: false,
showing_reblogs: true,
+ whitelisting: false,
endorsed: false
}
@@ -344,6 +348,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
requested: false,
domain_blocking: false,
showing_reblogs: true,
+ whitelisting: false,
endorsed: false
},
skip_thread_containment: false