From eb42e90c4f9ca35a6dc0e84e6f87b6f4b680173c Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Fri, 19 Aug 2022 13:56:39 -0400
Subject: Use Websockex to replace websocket_client

---
 test/support/websocket_client.ex | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'test/support/websocket_client.ex')

diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index 34b955474..2660f6151 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -5,18 +5,17 @@
 defmodule Pleroma.Integration.WebsocketClient do
   # https://github.com/phoenixframework/phoenix/blob/master/test/support/websocket_client.exs
 
+  use WebSockex
+
   @doc """
   Starts the WebSocket server for given ws URL. Received Socket.Message's
   are forwarded to the sender pid
   """
   def start_link(sender, url, headers \\ []) do
-    :crypto.start()
-    :ssl.start()
-
-    :websocket_client.start_link(
-      String.to_charlist(url),
+    WebSockex.start_link(
+      url,
       __MODULE__,
-      [sender],
+      %{ sender: sender },
       extra_headers: headers
     )
   end
@@ -36,27 +35,26 @@ defmodule Pleroma.Integration.WebsocketClient do
   end
 
   @doc false
-  def init([sender], _conn_state) do
-    {:ok, %{sender: sender}}
-  end
-
-  @doc false
-  def websocket_handle(frame, _conn_state, state) do
+  @impl true
+  def handle_frame(frame, state) do
     send(state.sender, frame)
     {:ok, state}
   end
 
   @doc false
-  def websocket_info({:text, msg}, _conn_state, state) do
+  @impl true
+  def handle_info({:text, msg}, state) do
     {:reply, {:text, msg}, state}
   end
 
-  def websocket_info(:close, _conn_state, _state) do
+  @impl true
+  def handle_info(:close, _state) do
     {:close, <<>>, "done"}
   end
 
   @doc false
-  def websocket_terminate(_reason, _conn_state, _state) do
+  @impl true
+  def terminate(_reason, _state) do
     :ok
   end
 end
-- 
cgit v1.2.3


From 3522852c6196cafa63804240f52dd593e09ba694 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Fri, 19 Aug 2022 14:09:42 -0400
Subject: Test that server will disconnect websocket upon token revocation

---
 test/support/websocket_client.ex | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'test/support/websocket_client.ex')

diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index 2660f6151..abe7d5eda 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -41,6 +41,12 @@ defmodule Pleroma.Integration.WebsocketClient do
     {:ok, state}
   end
 
+  @impl true
+  def handle_disconnect(conn_status, state) do
+    send(state.sender, {:close, conn_status})
+    {:ok, state}
+  end
+
   @doc false
   @impl true
   def handle_info({:text, msg}, state) do
-- 
cgit v1.2.3


From f459c1260b43396fb7173e97e29ccef441a615ec Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Fri, 19 Aug 2022 14:10:07 -0400
Subject: Lint

---
 test/support/websocket_client.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/support/websocket_client.ex')

diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex
index abe7d5eda..70d331999 100644
--- a/test/support/websocket_client.ex
+++ b/test/support/websocket_client.ex
@@ -15,7 +15,7 @@ defmodule Pleroma.Integration.WebsocketClient do
     WebSockex.start_link(
       url,
       __MODULE__,
-      %{ sender: sender },
+      %{sender: sender},
       extra_headers: headers
     )
   end
-- 
cgit v1.2.3