diff options
author | rinpatch <rinpatch@sdf.org> | 2020-09-10 18:40:54 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-09-10 18:40:54 +0000 |
commit | 53cf7fef6ec097d60b73ef3ad6771fed7c83ff48 (patch) | |
tree | 349d781b79455cc615710c9d35bdd8aebf049e83 /test | |
parent | 45c299e5b52e2324486d42d53543dbf1f5c02b7b (diff) | |
parent | 275602daa7c4a01dffb83759012554da2d9335fe (diff) | |
download | pleroma-53cf7fef6ec097d60b73ef3ad6771fed7c83ff48.tar.gz |
Merge branch 'fix/streaming-termination-errors' into 'develop'
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
Diffstat (limited to 'test')
-rw-r--r-- | test/integration/mastodon_websocket_test.exs | 26 |
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 |