aboutsummaryrefslogtreecommitdiff
path: root/test/web/pleroma_api
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-05 10:00:05 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-05 10:00:05 +0000
commite07e9cb75e6605218acea1ef41772ca29124bd0d (patch)
tree2a79aae59c6ce7500d360ba35a5b0aafe2146072 /test/web/pleroma_api
parent9c47d8571c6c46503d9bb836aea933eda6e9e0a5 (diff)
downloadpleroma-e07e9cb75e6605218acea1ef41772ca29124bd0d.tar.gz
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
Diffstat (limited to 'test/web/pleroma_api')
-rw-r--r--test/web/pleroma_api/controllers/pleroma_api_controller_test.exs2
1 files changed, 0 insertions, 2 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 8a6528cbb..7eaeda4a0 100644
--- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
@@ -8,7 +8,6 @@ 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
@@ -74,7 +73,6 @@ 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