summaryrefslogtreecommitdiff
path: root/test/web/streamer
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-12-05 17:16:23 +0000
committerlain <lain@soykaf.club>2019-12-05 17:16:23 +0000
commit67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (patch)
tree4fc937160ad56b81bd11b17e4a97a7a6255bd6e6 /test/web/streamer
parentd0bd4348b34075e1d9ed6905255c85c452e0b4ca (diff)
parentd3bce89edddf72e2eb78e7c84a93c5bd4b6c8ff8 (diff)
downloadpleroma-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/web/streamer')
-rw-r--r--test/web/streamer/streamer_test.exs6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/streamer/streamer_test.exs b/test/web/streamer/streamer_test.exs
index 8265f18dd..8911c46b1 100644
--- a/test/web/streamer/streamer_test.exs
+++ b/test/web/streamer/streamer_test.exs
@@ -59,7 +59,7 @@ defmodule Pleroma.Web.StreamerTest do
user: user
} do
blocked = insert(:user)
- {:ok, user} = User.block(user, blocked)
+ {:ok, _user_relationship} = User.block(user, blocked)
task = Task.async(fn -> refute_receive {:text, _}, 4_000 end)
@@ -259,7 +259,7 @@ defmodule Pleroma.Web.StreamerTest do
test "it doesn't send messages involving blocked users" do
user = insert(:user)
blocked_user = insert(:user)
- {:ok, user} = User.block(user, blocked_user)
+ {:ok, _user_relationship} = User.block(user, blocked_user)
task =
Task.async(fn ->
@@ -301,7 +301,7 @@ defmodule Pleroma.Web.StreamerTest do
"public" => [fake_socket]
}
- {:ok, blocker} = User.block(blocker, blockee)
+ {:ok, _user_relationship} = User.block(blocker, blockee)
{:ok, activity_one} = CommonAPI.post(friend, %{"status" => "hey! @#{blockee.nickname}"})