diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-05 19:28:07 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-05 19:28:07 +0000 |
| commit | 17ff4b43cb75334e6a6845a7d7ec9c88285a339d (patch) | |
| tree | 44c9f86abc9d5eda51ccbe001c6f48779cf41cad /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | 0ee6100c8d7d21eb0c7cdd1c098a5071c0b9682f (diff) | |
| parent | 8249924485965148f3a690c5d76e5f8b3bd78940 (diff) | |
| download | pleroma-17ff4b43cb75334e6a6845a7d7ec9c88285a339d.tar.gz pleroma-17ff4b43cb75334e6a6845a7d7ec9c88285a339d.zip | |
Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
Diffstat (limited to 'test/web/pleroma_api/controllers/pleroma_api_controller_test.exs')
| -rw-r--r-- | test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs index 7eaeda4a0..8a6528cbb 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -8,6 +8,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do alias Pleroma.Conversation.Participation alias Pleroma.Notification alias Pleroma.Repo + alias Pleroma.User alias Pleroma.Web.CommonAPI import Pleroma.Factory @@ -73,6 +74,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do participation = Repo.preload(participation, :recipients) + user = User.get_cached_by_id(user.id) assert [user] == participation.recipients assert other_user not in participation.recipients |