summaryrefslogtreecommitdiff
path: root/test/integration/mastodon_websocket_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-09-17 08:41:35 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-09-17 08:41:35 +0300
commitb867f9d7aebc4e5b8832228a54f928b9f92dad0e (patch)
treeee00341390c7e3382092a8f4191485f15067f943 /test/integration/mastodon_websocket_test.exs
parent917d325972e3aeb367583c61aaa109d62fcba837 (diff)
parentc5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff)
downloadpleroma-b867f9d7aebc4e5b8832228a54f928b9f92dad0e.tar.gz
pleroma-b867f9d7aebc4e5b8832228a54f928b9f92dad0e.zip
Merge branch 'develop' into issue/2099
Diffstat (limited to 'test/integration/mastodon_websocket_test.exs')
-rw-r--r--test/integration/mastodon_websocket_test.exs26
1 files changed, 13 insertions, 13 deletions
diff --git a/test/integration/mastodon_websocket_test.exs b/test/integration/mastodon_websocket_test.exs
index ea17e9feb..76fbc8bda 100644
--- a/test/integration/mastodon_websocket_test.exs
+++ b/test/integration/mastodon_websocket_test.exs
@@ -99,30 +99,30 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
test "accepts the 'user' stream", %{token: token} = _state do
assert {:ok, _} = start_socket("?stream=user&access_token=#{token.token}")
- assert capture_log(fn ->
- assert {:error, {401, _}} = start_socket("?stream=user")
- Process.sleep(30)
- end) =~ ":badarg"
+ capture_log(fn ->
+ assert {:error, {401, _}} = start_socket("?stream=user")
+ Process.sleep(30)
+ end)
end
test "accepts the 'user:notification' stream", %{token: token} = _state do
assert {:ok, _} = start_socket("?stream=user:notification&access_token=#{token.token}")
- assert capture_log(fn ->
- assert {:error, {401, _}} = start_socket("?stream=user:notification")
- Process.sleep(30)
- end) =~ ":badarg"
+ capture_log(fn ->
+ assert {:error, {401, _}} = start_socket("?stream=user:notification")
+ Process.sleep(30)
+ end)
end
test "accepts valid token on Sec-WebSocket-Protocol header", %{token: token} do
assert {:ok, _} = start_socket("?stream=user", [{"Sec-WebSocket-Protocol", token.token}])
- assert capture_log(fn ->
- assert {:error, {401, _}} =
- start_socket("?stream=user", [{"Sec-WebSocket-Protocol", "I am a friend"}])
+ capture_log(fn ->
+ assert {:error, {401, _}} =
+ start_socket("?stream=user", [{"Sec-WebSocket-Protocol", "I am a friend"}])
- Process.sleep(30)
- end) =~ ":badarg"
+ Process.sleep(30)
+ end)
end
end
end