diff options
| author | lain <lain@soykaf.club> | 2019-10-06 08:11:47 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-06 08:11:47 +0000 |
| commit | 61097ba6ab1f40f8a885f1adc96455b3c82cfd9b (patch) | |
| tree | 4ead08dab6a485b3020fb9f30663e4b4466698ae /test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | |
| parent | 1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626 (diff) | |
| parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
| download | pleroma-61097ba6ab1f40f8a885f1adc96455b3c82cfd9b.tar.gz pleroma-61097ba6ab1f40f8a885f1adc96455b3c82cfd9b.zip | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
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 3a5dbdeea..44ea85b45 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -9,6 +9,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do alias Pleroma.Notification alias Pleroma.Object alias Pleroma.Repo + alias Pleroma.User alias Pleroma.Web.CommonAPI import Pleroma.Factory @@ -133,6 +134,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 |