diff options
| author | lain <lain@soykaf.club> | 2019-12-05 17:16:23 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-05 17:16:23 +0000 |
| commit | 67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (patch) | |
| tree | 4fc937160ad56b81bd11b17e4a97a7a6255bd6e6 /test/conversation | |
| parent | d0bd4348b34075e1d9ed6905255c85c452e0b4ca (diff) | |
| parent | d3bce89edddf72e2eb78e7c84a93c5bd4b6c8ff8 (diff) | |
| download | pleroma-67d8df04a440ec9b2949bdddd3a3d8dd70c9b140.tar.gz pleroma-67d8df04a440ec9b2949bdddd3a3d8dd70c9b140.zip | |
Merge branch '1335-user-api-id-fields-relations' into 'develop'
[#1335] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
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 |