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/conversation | |
| 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/conversation')
| -rw-r--r-- | test/conversation/participation_test.exs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/conversation/participation_test.exs b/test/conversation/participation_test.exs index f430bdf75..a27167d42 100644 --- a/test/conversation/participation_test.exs +++ b/test/conversation/participation_test.exs @@ -6,7 +6,6 @@ defmodule Pleroma.Conversation.ParticipationTest do use Pleroma.DataCase import Pleroma.Factory alias Pleroma.Conversation.Participation - alias Pleroma.User alias Pleroma.Web.CommonAPI test "getting a participation will also preload things" do @@ -31,8 +30,6 @@ defmodule Pleroma.Conversation.ParticipationTest do {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @#{other_user.nickname}.", "visibility" => "direct"}) - user = User.get_cached_by_id(user.id) - other_user = User.get_cached_by_id(user.id) [participation] = Participation.for_user(user) participation = Pleroma.Repo.preload(participation, :recipients) @@ -158,7 +155,6 @@ defmodule Pleroma.Conversation.ParticipationTest do [participation] = Participation.for_user_with_last_activity_id(user) participation = Repo.preload(participation, :recipients) - user = User.get_cached_by_id(user.id) assert participation.recipients |> length() == 1 assert user in participation.recipients |