diff options
author | Maxim Filippov <colixer@gmail.com> | 2019-12-12 02:16:23 +0300 |
---|---|---|
committer | Maxim Filippov <colixer@gmail.com> | 2019-12-12 02:16:23 +0300 |
commit | 3ecf131511afc1fc366be6402ca94cf0e6c30e11 (patch) | |
tree | 0e8a59c43ccc344bb7d57c32826675aa706b7e8e /test/web/streamer | |
parent | cc36a8ea906bd22884101632c6d62c9572e846e1 (diff) | |
parent | fd697cf2090b61db60a02694c3227850df176e2d (diff) | |
download | pleroma-3ecf131511afc1fc366be6402ca94cf0e6c30e11.tar.gz pleroma-3ecf131511afc1fc366be6402ca94cf0e6c30e11.zip |
Merge branch 'develop' into feature/report-notes
Diffstat (limited to 'test/web/streamer')
-rw-r--r-- | test/web/streamer/streamer_test.exs | 6 |
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}"}) |