summaryrefslogtreecommitdiff
path: root/test/conversation
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-10-05 15:10:57 +0200
committerlain <lain@soykaf.club>2019-10-05 15:10:57 +0200
commit1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626 (patch)
treeb86cb69103fba795ee7dc0f8b3753fb322f79032 /test/conversation
parentd9aaea44ff02d6a07d3be0f0675830eb51ac85ef (diff)
parente51c20f28a91028b06a5783601e4ce09536bba5b (diff)
downloadpleroma-1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626.tar.gz
pleroma-1ed8fbc4d96c1d44ab968d6aa1b0069c55e44626.zip
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'test/conversation')
-rw-r--r--test/conversation/participation_test.exs4
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