From e30213bc831c0d323b1ae58a5c8678b1e0566ddc Mon Sep 17 00:00:00 2001 From: Alexandre de Souza Date: Fri, 11 Nov 2022 12:00:47 -0300 Subject: [PATCH] Update WebSocket error responses (#1524) --- test/livebook/web_socket/client_test.exs | 8 ++++---- test/livebook/web_socket/server_test.exs | 8 ++++---- test/livebook/web_socket_test.exs | 6 ++++-- .../live/hub/new/enterprise_component_test.exs | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/test/livebook/web_socket/client_test.exs b/test/livebook/web_socket/client_test.exs index b254b2d6d..d4a37de4f 100644 --- a/test/livebook/web_socket/client_test.exs +++ b/test/livebook/web_socket/client_test.exs @@ -27,16 +27,16 @@ defmodule Livebook.WebSocket.ClientTest do assert response.status == 403 - assert %{type: {:error, %{details: "Invalid Token"}}} = - LivebookProto.Response.decode(response.body) + assert %{type: {:error, %{details: error}}} = LivebookProto.Response.decode(response.body) + assert error =~ "the given token is invalid" assert {:ok, conn, ref} = Client.connect(url) assert {:error, _conn, response} = Client.receive(conn, ref) assert response.status == 401 - assert %{type: {:error, %{details: "Token not found"}}} = - LivebookProto.Response.decode(response.body) + assert %{type: {:error, %{details: error}}} = LivebookProto.Response.decode(response.body) + assert error =~ "could not get the token from the connection" end end end diff --git a/test/livebook/web_socket/server_test.exs b/test/livebook/web_socket/server_test.exs index 13b69817d..7ff9fea18 100644 --- a/test/livebook/web_socket/server_test.exs +++ b/test/livebook/web_socket/server_test.exs @@ -31,15 +31,15 @@ defmodule Livebook.WebSocket.ServerTest do assert response.status == 403 - assert %{type: {:error, %{details: "Invalid Token"}}} = - LivebookProto.Response.decode(response.body) + assert %{type: {:error, %{details: error}}} = LivebookProto.Response.decode(response.body) + assert error =~ "the given token is invalid" assert {:error, response} = Server.connect(pid, url) assert response.status == 401 - assert %{type: {:error, %{details: "Token not found"}}} = - LivebookProto.Response.decode(response.body) + assert %{type: {:error, %{details: error}}} = LivebookProto.Response.decode(response.body) + assert error =~ "could not get the token from the connection" assert Server.disconnect(pid) == :ok end diff --git a/test/livebook/web_socket_test.exs b/test/livebook/web_socket_test.exs index b997b4be4..0f1dcff83 100644 --- a/test/livebook/web_socket_test.exs +++ b/test/livebook/web_socket_test.exs @@ -16,10 +16,12 @@ defmodule Livebook.WebSocketTest do test "rejects the web socket connection with invalid credentials", %{url: url} do headers = [{"X-Auth-Token", "foo"}] - assert {:error, connection, %{details: "Invalid Token"}} = WebSocket.connect(url, headers) + assert {:error, connection, %{details: error}} = WebSocket.connect(url, headers) + assert error =~ "the given token is invalid" assert WebSocket.disconnect(connection) == :ok - assert {:error, connection, %{details: "Token not found"}} = WebSocket.connect(url) + assert {:error, connection, %{details: error}} = WebSocket.connect(url) + assert error =~ "could not get the token from the connection" assert WebSocket.disconnect(connection) == :ok end end diff --git a/test/livebook_web/live/hub/new/enterprise_component_test.exs b/test/livebook_web/live/hub/new/enterprise_component_test.exs index c305333ba..e9c8a2f87 100644 --- a/test/livebook_web/live/hub/new/enterprise_component_test.exs +++ b/test/livebook_web/live/hub/new/enterprise_component_test.exs @@ -81,7 +81,7 @@ defmodule LivebookWeb.Hub.New.EnterpriseComponentTest do |> element("#connect") |> render_click() - assert render(view) =~ "Invalid Token" + assert render(view) =~ "the given token is invalid" refute render(view) =~ "enterprise[hub_name]" end