diff options
author | kaniini <ariadne@dereferenced.org> | 2019-10-05 10:00:44 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-10-05 10:00:44 +0000 |
commit | e51c20f28a91028b06a5783601e4ce09536bba5b (patch) | |
tree | 2a79aae59c6ce7500d360ba35a5b0aafe2146072 /test/web/mastodon_api/views | |
parent | 9c47d8571c6c46503d9bb836aea933eda6e9e0a5 (diff) | |
parent | e07e9cb75e6605218acea1ef41772ca29124bd0d (diff) | |
download | pleroma-e51c20f28a91028b06a5783601e4ce09536bba5b.tar.gz pleroma-e51c20f28a91028b06a5783601e4ce09536bba5b.zip |
Merge branch 'revert-5c04e817' into 'develop'
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
See merge request pleroma/pleroma!1794
Diffstat (limited to 'test/web/mastodon_api/views')
-rw-r--r-- | test/web/mastodon_api/views/account_view_test.exs | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs index b7a4938a6..62b2ab7e3 100644 --- a/test/web/mastodon_api/views/account_view_test.exs +++ b/test/web/mastodon_api/views/account_view_test.exs @@ -418,27 +418,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do following_count: 1 } = AccountView.render("show.json", %{user: user, for: user}) end - - test "shows unread_conversation_count only to the account owner" do - user = insert(:user) - other_user = insert(:user) - - {:ok, _activity} = - CommonAPI.post(user, %{ - "status" => "Hey @#{other_user.nickname}.", - "visibility" => "direct" - }) - - user = User.get_cached_by_ap_id(user.ap_id) - - assert AccountView.render("show.json", %{user: user, for: other_user})[:pleroma][ - :unread_conversation_count - ] == nil - - assert AccountView.render("show.json", %{user: user, for: user})[:pleroma][ - :unread_conversation_count - ] == 1 - end end describe "follow requests counter" do |