diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
| commit | cdff5b82670313e46c2b362d4cf041779af6a6bd (patch) | |
| tree | edc39a1b48f48334480e709fbda844cb120b32f8 /test/conversation | |
| parent | 9f99640cfc81f28c0b6cdb5f6ef065b3e46f5f23 (diff) | |
| parent | 67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (diff) | |
| download | pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.tar.gz pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.zip | |
Merge branch 'develop' into fix/mrf-delete
Diffstat (limited to 'test/conversation')
| -rw-r--r-- | test/conversation/participation_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/conversation/participation_test.exs b/test/conversation/participation_test.exs index 863270022..9b2c97963 100644 --- a/test/conversation/participation_test.exs +++ b/test/conversation/participation_test.exs @@ -252,7 +252,7 @@ defmodule Pleroma.Conversation.ParticipationTest do assert User.get_cached_by_id(blocker.id).unread_conversation_count == 4 - {:ok, blocker} = User.block(blocker, blocked) + {:ok, _user_relationship} = User.block(blocker, blocked) # The conversations with the blocked user are marked as read assert [%{read: true}, %{read: true}, %{read: true}, %{read: false}] = @@ -274,7 +274,7 @@ defmodule Pleroma.Conversation.ParticipationTest do blocked = insert(:user) third_user = insert(:user) - {:ok, blocker} = User.block(blocker, blocked) + {:ok, _user_relationship} = User.block(blocker, blocked) # When the blocked user is the author {:ok, _direct1} = @@ -311,7 +311,7 @@ defmodule Pleroma.Conversation.ParticipationTest do "visibility" => "direct" }) - {:ok, blocker} = User.block(blocker, blocked) + {:ok, _user_relationship} = User.block(blocker, blocked) assert [%{read: true}] = Participation.for_user(blocker) assert User.get_cached_by_id(blocker.id).unread_conversation_count == 0 |