diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
| commit | 9ef912aecfbeef670db0614ec2014321c37f3b7a (patch) | |
| tree | 69eb0b5e11ca321e1ba8ca794171bf0cb425d16d /test/conversation | |
| parent | e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7 (diff) | |
| parent | 92b4a1aa1bc750bb077ae45c422967f9712e247d (diff) | |
| download | pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.tar.gz pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.zip | |
Merge branch 'develop' into issue/1411
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 |