diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-04 17:33:18 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-04 17:33:18 +0000 |
| commit | 5c04e8172407660662d1e052e40a665bdb063ae9 (patch) | |
| tree | bdf7b5b55064bebc7ce380d1a12fbf153a68a5c1 /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | 75e415d5f4981c2deab324a9161a183d0a498e5b (diff) | |
| parent | 06d9df79c5c99069dd12e863c99167eb20b6495b (diff) | |
| download | pleroma-5c04e8172407660662d1e052e40a665bdb063ae9.tar.gz pleroma-5c04e8172407660662d1e052e40a665bdb063ae9.zip | |
Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
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 |