commit: 4194559ea6d3e0f219ae8e77b468782ac115d134
parent d0c1997d483f918b46bdf45cecef82d8aabcb5f1
Author: Sean King <seanking2919@protonmail.com>
Date: Sun, 20 Mar 2022 17:26:07 -0600
Fix lint errors
Diffstat:
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/test/pleroma/integration/mastodon_websocket_test.exs b/test/pleroma/integration/mastodon_websocket_test.exs
@@ -34,15 +34,22 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
test "refuses invalid requests" do
capture_log(fn ->
assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 404}} = start_socket()
- assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 404}} = start_socket("?stream=ncjdk")
+
+ assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 404}} =
+ start_socket("?stream=ncjdk")
+
Process.sleep(30)
end)
end
test "requires authentication and a valid token for protected streams" do
capture_log(fn ->
- assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} = start_socket("?stream=user&access_token=aaaaaaaaaaaa")
- assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} = start_socket("?stream=user")
+ assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} =
+ start_socket("?stream=user&access_token=aaaaaaaaaaaa")
+
+ assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} =
+ start_socket("?stream=user")
+
Process.sleep(30)
end)
end
@@ -102,7 +109,9 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok, _} = start_socket("?stream=user&access_token=#{token.token}")
capture_log(fn ->
- assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} = start_socket("?stream=user")
+ assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} =
+ start_socket("?stream=user")
+
Process.sleep(30)
end)
end
@@ -111,7 +120,9 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok, _} = start_socket("?stream=user:notification&access_token=#{token.token}")
capture_log(fn ->
- assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} = start_socket("?stream=user:notification")
+ assert {:error, %Mint.WebSocket.UpgradeFailureError{status_code: 401}} =
+ start_socket("?stream=user:notification")
+
Process.sleep(30)
end)
end
diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
@@ -188,8 +188,8 @@ defmodule Pleroma.Integration.WebsocketClient do
defp stream_frame(state, frame) do
with {:ok, websocket, data} <- Mint.WebSocket.encode(state.websocket, frame),
state = put_in(state.websocket, websocket),
- {:ok, conn} <- Mint.WebSocket.stream_request_body(state.conn, state.request_ref, data) do
- {:ok, put_in(state.conn, conn)}
+ {:ok, conn} <- Mint.WebSocket.stream_request_body(state.conn, state.request_ref, data) do
+ {:ok, put_in(state.conn, conn)}
else
{:error, %Mint.WebSocket{} = websocket, reason} ->
{:error, put_in(state.websocket, websocket), reason}