projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1023
[akkoma]
/
test
/
web
/
mastodon_api
/
views
/
account_view_test.exs
diff --git
a/test/web/mastodon_api/views/account_view_test.exs
b/test/web/mastodon_api/views/account_view_test.exs
index f5bfc9c678c6aeb50af32d331ca0dea3d6bd443e..a83bf90a31cdc57ee0612d515dfe07edeb86a57e 100644
(file)
--- a/
test/web/mastodon_api/views/account_view_test.exs
+++ b/
test/web/mastodon_api/views/account_view_test.exs
@@
-90,7
+90,8
@@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
hide_followers_count: false,
hide_follows_count: false,
relationship: %{},
hide_followers_count: false,
hide_follows_count: false,
relationship: %{},
- skip_thread_containment: false
+ skip_thread_containment: false,
+ accepts_chat_messages: nil
}
}
}
}
@@
-118,11
+119,8
@@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
user = insert(:user)
notification_settings = %{
user = insert(:user)
notification_settings = %{
- followers: true,
- follows: true,
- non_followers: true,
- non_follows: true,
- privacy_option: false
+ block_from_strangers: false,
+ hide_notification_contents: false
}
privacy = user.default_scope
}
privacy = user.default_scope
@@
-186,7
+184,8
@@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
hide_followers_count: false,
hide_follows_count: false,
relationship: %{},
hide_followers_count: false,
hide_follows_count: false,
relationship: %{},
- skip_thread_containment: false
+ skip_thread_containment: false,
+ accepts_chat_messages: nil
}
}
}
}