Merge branch 'issue/941' into 'develop'

[akkoma] / test / web / mastodon_api / account_view_test.exs

diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index ca73d6581a7edfd9ed61d3476cc96d4afeee64af..e2244dcb7c8ca0182994e6c3a6024fd186ed4ea7 100644 (file)
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -67,7 +67,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
         hide_favorites: true,
         hide_followers: false,
         hide_follows: false,
-        relationship: %{}
+        relationship: %{},
+        skip_thread_containment: false
       }
     }
 
@@ -78,10 +79,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     user = insert(:user)
 
     notification_settings = %{
-      "remote" => true,
-      "local" => true,
       "followers" => true,
-      "follows" => true
+      "follows" => true,
+      "non_follows" => true,
+      "non_followers" => true
     }
 
     privacy = user.info.default_scope
@@ -132,7 +133,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
         hide_favorites: true,
         hide_followers: false,
         hide_follows: false,
-        relationship: %{}
+        relationship: %{},
+        skip_thread_containment: false
       }
     }
 
@@ -233,7 +235,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
           domain_blocking: false,
           showing_reblogs: true,
           endorsed: false
-        }
+        },
+        skip_thread_containment: false
       }
     }
 
@@ -246,12 +249,12 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     result =
       AccountView.render("account.json", %{user: user, for: user, with_pleroma_settings: true})
 
-    assert result.pleroma.settings == %{:fe => "test"}
+    assert result.pleroma.settings_store == %{:fe => "test"}
 
     result = AccountView.render("account.json", %{user: user, with_pleroma_settings: true})
-    assert result.pleroma[:settings] == nil
+    assert result.pleroma[:settings_store] == nil
 
     result = AccountView.render("account.json", %{user: user, for: user})
-    assert result.pleroma[:settings] == nil
+    assert result.pleroma[:settings_store] == nil
   end
 end