projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
test
/
web
/
streamer
/
streamer_test.exs
diff --git
a/test/web/streamer/streamer_test.exs
b/test/web/streamer/streamer_test.exs
index 80a7541b22f3a84bd731737f54ee0d7589e1e914..8911c46b190bdd62e2ccc328697ea2c5d2cf3e40 100644
(file)
--- a/
test/web/streamer/streamer_test.exs
+++ b/
test/web/streamer/streamer_test.exs
@@
-15,7
+15,7
@@
defmodule Pleroma.Web.StreamerTest do
alias Pleroma.Web.Streamer.StreamerSocket
alias Pleroma.Web.Streamer.Worker
alias Pleroma.Web.Streamer.StreamerSocket
alias Pleroma.Web.Streamer.Worker
- @moduletag needs_streamer: true
+ @moduletag needs_streamer: true
, capture_log: true
clear_config_all([:instance, :skip_thread_containment])
describe "user streams" do
clear_config_all([:instance, :skip_thread_containment])
describe "user streams" do
@@
-59,7
+59,7
@@
defmodule Pleroma.Web.StreamerTest do
user: user
} do
blocked = insert(:user)
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)
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)
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 ->
task =
Task.async(fn ->
@@
-301,7
+301,7
@@
defmodule Pleroma.Web.StreamerTest do
"public" => [fake_socket]
}
"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}"})
{:ok, activity_one} = CommonAPI.post(friend, %{"status" => "hey! @#{blockee.nickname}"})