- <%= for {secret_name, secret_value} <- Enum.sort(@enterprise_secrets) do %>
+ <%= for {secret_name, secret_value} <- Enum.sort(@hub_secrets) do %>
assign(enterprise_secrets: fetch_enterprise_secrets())
+ |> assign(hub_secrets: get_hub_secrets())
|> put_flash(:info, "A new secret has been created on your Livebook Enterprise")}
end
def handle_info({:secret_updated, %Secrets.Secret{}}, socket) do
{:noreply,
socket
- |> assign(enterprise_secrets: fetch_enterprise_secrets())
+ |> assign(hub_secrets: get_hub_secrets())
|> put_flash(:info, "An existing secret has been updated on your Livebook Enterprise")}
end
@@ -2298,7 +2297,7 @@ defmodule LivebookWeb.SessionLive do
secret in secrets
end
- defp fetch_enterprise_secrets do
+ defp get_hub_secrets do
for connected_hub <- Hubs.get_connected_hubs(),
secret <- EnterpriseClient.list_cached_secrets(connected_hub.pid),
into: %{},
diff --git a/test/livebook/hubs/enterprise_client_test.exs b/test/livebook/hubs/enterprise_client_test.exs
index c801b4d76..0da621bde 100644
--- a/test/livebook/hubs/enterprise_client_test.exs
+++ b/test/livebook/hubs/enterprise_client_test.exs
@@ -6,7 +6,7 @@ defmodule Livebook.Hubs.EnterpriseClientTest do
alias Livebook.Secrets.Secret
setup do
- EnterpriseClient.subscribe()
+ Livebook.Hubs.subscribe([:connection, :secrets])
:ok
end
@@ -15,21 +15,21 @@ defmodule Livebook.Hubs.EnterpriseClientTest do
enterprise = build(:enterprise, url: url, token: token)
EnterpriseClient.start_link(enterprise)
- assert_receive {:connect, :ok, :connected}
+ assert_receive :hub_connected
end
test "rejects the websocket with invalid address", %{token: token} do
enterprise = build(:enterprise, url: "http://localhost:9999", token: token)
EnterpriseClient.start_link(enterprise)
- assert_receive {:connect, :error, "connection refused"}
+ assert_receive {:connection_error, "connection refused"}
end
test "rejects the web socket connection with invalid credentials", %{url: url} do
enterprise = build(:enterprise, url: url, token: "foo")
EnterpriseClient.start_link(enterprise)
- assert_receive {:connect, :error, reason}
+ assert_receive {:connection_error, reason}
assert reason =~ "the given token is invalid"
end
end
@@ -38,8 +38,7 @@ defmodule Livebook.Hubs.EnterpriseClientTest do
setup %{url: url, token: token} do
enterprise = build(:enterprise, url: url, token: token)
EnterpriseClient.start_link(enterprise)
-
- assert_receive {:connect, :ok, :connected}
+ assert_receive :hub_connected
:ok
end
diff --git a/test/livebook/hubs/provider_test.exs b/test/livebook/hubs/provider_test.exs
index 321afd4c5..c492d719b 100644
--- a/test/livebook/hubs/provider_test.exs
+++ b/test/livebook/hubs/provider_test.exs
@@ -10,7 +10,7 @@ defmodule Livebook.Hubs.ProviderTest do
assert Provider.normalize(fly) == %Metadata{
id: fly.id,
name: fly.hub_name,
- color: fly.hub_color,
+ emoji: fly.hub_emoji,
provider: fly
}
end
diff --git a/test/livebook/hubs_test.exs b/test/livebook/hubs_test.exs
index e9aeed9d0..f68a3f1d0 100644
--- a/test/livebook/hubs_test.exs
+++ b/test/livebook/hubs_test.exs
@@ -23,7 +23,7 @@ defmodule Livebook.HubsTest do
assert Hubs.get_metadatas() == [
%Hubs.Metadata{
id: "fly-livebook",
- color: fly.hub_color,
+ emoji: fly.hub_emoji,
name: fly.hub_name,
provider: fly
}
@@ -60,9 +60,9 @@ defmodule Livebook.HubsTest do
test "save_hub/1 updates hub" do
fly = insert_hub(:fly, id: "fly-foo2")
- Hubs.save_hub(%{fly | hub_color: "#FFFFFF"})
+ Hubs.save_hub(%{fly | hub_emoji: "🐈"})
refute Hubs.fetch_hub!("fly-foo2") == fly
- assert Hubs.fetch_hub!("fly-foo2").hub_color == "#FFFFFF"
+ assert Hubs.fetch_hub!("fly-foo2").hub_emoji == "🐈"
end
end
diff --git a/test/livebook_web/live/hub/edit_live_test.exs b/test/livebook_web/live/hub/edit_live_test.exs
index 3662e619f..abd3452c7 100644
--- a/test/livebook_web/live/hub/edit_live_test.exs
+++ b/test/livebook_web/live/hub/edit_live_test.exs
@@ -40,7 +40,7 @@ defmodule LivebookWeb.Hub.EditLiveTest do
attrs = %{
"hub_name" => "Personal Hub",
- "hub_color" => "#FF00FF"
+ "hub_emoji" => "🐈"
}
view
@@ -59,7 +59,7 @@ defmodule LivebookWeb.Hub.EditLiveTest do
assert render(view) =~ "Hub updated successfully"
- assert_hub(view, conn, %{hub | hub_color: attrs["hub_color"], hub_name: attrs["hub_name"]})
+ assert_hub(view, conn, %{hub | hub_emoji: attrs["hub_emoji"], hub_name: attrs["hub_name"]})
refute Hubs.fetch_hub!(hub.id) == hub
end
@@ -195,7 +195,7 @@ defmodule LivebookWeb.Hub.EditLiveTest do
hub = insert_hub(:enterprise)
{:ok, view, _html} = live(conn, Routes.hub_path(conn, :edit, hub.id))
- attrs = %{"hub_color" => "#FF00FF"}
+ attrs = %{"hub_emoji" => "🐈"}
view
|> element("#enterprise-form")
@@ -213,7 +213,7 @@ defmodule LivebookWeb.Hub.EditLiveTest do
assert render(view) =~ "Hub updated successfully"
- assert_hub(view, conn, %{hub | hub_color: attrs["hub_color"]})
+ assert_hub(view, conn, %{hub | hub_emoji: attrs["hub_emoji"]})
refute Hubs.fetch_hub!(hub.id) == hub
end
end
@@ -221,7 +221,7 @@ defmodule LivebookWeb.Hub.EditLiveTest do
defp assert_hub(view, conn, hub) do
hubs_html = view |> element("#hubs") |> render()
- assert hubs_html =~ ~s/style="color: #{hub.hub_color}"/
+ assert hubs_html =~ hub.hub_emoji
assert hubs_html =~ Routes.hub_path(conn, :edit, hub.id)
assert hubs_html =~ hub.hub_name
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 22c5968bf..e2a9a5f0e 100644
--- a/test/livebook_web/live/hub/new/enterprise_component_test.exs
+++ b/test/livebook_web/live/hub/new/enterprise_component_test.exs
@@ -37,7 +37,7 @@ defmodule LivebookWeb.Hub.New.EnterpriseComponentTest do
"url" => url,
"token" => token,
"hub_name" => "Enterprise",
- "hub_color" => "#FF00FF"
+ "hub_emoji" => "🐈"
}
view
@@ -58,7 +58,7 @@ defmodule LivebookWeb.Hub.New.EnterpriseComponentTest do
assert render(view) =~ "Hub added successfully"
hubs_html = view |> element("#hubs") |> render()
- assert hubs_html =~ ~s/style="color: #FF00FF"/
+ assert hubs_html =~ "🐈"
assert hubs_html =~ "/hub/enterprise-#{id}"
assert hubs_html =~ "Enterprise"
end
@@ -94,8 +94,13 @@ defmodule LivebookWeb.Hub.New.EnterpriseComponentTest do
stop_new_instance(name)
end
- test "fails to create existing hub", %{conn: conn, url: url, token: token} do
- node = EnterpriseServer.get_node()
+ test "fails to create existing hub", %{test: name, conn: conn} do
+ start_new_instance(name)
+
+ node = EnterpriseServer.get_node(name)
+ url = EnterpriseServer.url(name)
+ token = EnterpriseServer.token(name)
+
id = :erpc.call(node, Enterprise.Integration, :fetch_env!, [])
user = :erpc.call(node, Enterprise.Integration, :create_user, [])
@@ -135,7 +140,7 @@ defmodule LivebookWeb.Hub.New.EnterpriseComponentTest do
"url" => url,
"token" => token,
"hub_name" => "Enterprise",
- "hub_color" => "#FFFFFF"
+ "hub_emoji" => "🐈"
}
view
@@ -151,11 +156,13 @@ defmodule LivebookWeb.Hub.New.EnterpriseComponentTest do
|> render_submit(%{"enterprise" => attrs}) =~ "already exists"
hubs_html = view |> element("#hubs") |> render()
- assert hubs_html =~ ~s/style="color: #{hub.hub_color}"/
+ assert hubs_html =~ hub.hub_emoji
assert hubs_html =~ Routes.hub_path(conn, :edit, hub.id)
assert hubs_html =~ hub.hub_name
assert Hubs.fetch_hub!(hub.id) == hub
+ after
+ stop_new_instance(name)
end
end
diff --git a/test/livebook_web/live/hub/new_live_test.exs b/test/livebook_web/live/hub/new_live_test.exs
index 45adc3b58..8c0c20e47 100644
--- a/test/livebook_web/live/hub/new_live_test.exs
+++ b/test/livebook_web/live/hub/new_live_test.exs
@@ -36,7 +36,7 @@ defmodule LivebookWeb.Hub.NewLiveTest do
"access_token" => "dummy access token",
"application_id" => "123456789",
"hub_name" => "My Foo Hub",
- "hub_color" => "#FF00FF"
+ "hub_emoji" => "🐈"
}
view
@@ -55,17 +55,11 @@ defmodule LivebookWeb.Hub.NewLiveTest do
assert render(view) =~ "Hub added successfully"
- assert view
- |> element("#hubs")
- |> render() =~ ~s/style="color: #FF00FF"/
+ hubs_html = view |> element("#hubs") |> render()
- assert view
- |> element("#hubs")
- |> render() =~ "/hub/fly-123456789"
-
- assert view
- |> element("#hubs")
- |> render() =~ "My Foo Hub"
+ assert hubs_html =~ "🐈"
+ assert hubs_html =~ "/hub/fly-123456789"
+ assert hubs_html =~ "My Foo Hub"
end
test "fails to create existing hub", %{conn: conn} do
@@ -87,7 +81,7 @@ defmodule LivebookWeb.Hub.NewLiveTest do
"access_token" => "dummy access token",
"application_id" => "foo",
"hub_name" => "My Foo Hub",
- "hub_color" => "#FF00FF"
+ "hub_emoji" => "🐈"
}
view
@@ -102,18 +96,7 @@ defmodule LivebookWeb.Hub.NewLiveTest do
|> element("#fly-form")
|> render_submit(%{"fly" => attrs}) =~ "already exists"
- assert view
- |> element("#hubs")
- |> render() =~ ~s/style="color: #{hub.hub_color}"/
-
- assert view
- |> element("#hubs")
- |> render() =~ Routes.hub_path(conn, :edit, hub.id)
-
- assert view
- |> element("#hubs")
- |> render() =~ hub.hub_name
-
+ assert_hub(view, conn, hub)
assert Hubs.fetch_hub!(hub.id) == hub
end
end
@@ -177,4 +160,12 @@ defmodule LivebookWeb.Hub.NewLiveTest do
%{"data" => %{"app" => app}}
end
+
+ defp assert_hub(view, conn, hub) do
+ hubs_html = view |> element("#hubs") |> render()
+
+ assert hubs_html =~ hub.hub_emoji
+ assert hubs_html =~ Routes.hub_path(conn, :edit, hub.id)
+ assert hubs_html =~ hub.hub_name
+ end
end
diff --git a/test/livebook_web/live/session_live/secrets_component_test.exs b/test/livebook_web/live/session_live/secrets_component_test.exs
index 90a8adc03..a3179a8f8 100644
--- a/test/livebook_web/live/session_live/secrets_component_test.exs
+++ b/test/livebook_web/live/session_live/secrets_component_test.exs
@@ -9,7 +9,8 @@ defmodule LivebookWeb.SessionLive.SecretsComponentTest do
describe "enterprise" do
setup %{url: url, token: token} do
- id = Livebook.Utils.random_id()
+ node = EnterpriseServer.get_node()
+ id = :erpc.call(node, Enterprise.Integration, :fetch_env!, [])
Livebook.Hubs.delete_hub("enterprise-#{id}")
enterprise =
@@ -21,8 +22,7 @@ defmodule LivebookWeb.SessionLive.SecretsComponentTest do
)
{:ok, session} = Sessions.create_session(notebook: Livebook.Notebook.new())
- Livebook.Hubs.EnterpriseClient.subscribe()
- Livebook.Hubs.connect_hubs()
+ Livebook.Hubs.subscribe(:secrets)
on_exit(fn ->
Session.close(session.pid)
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 94c5950b2..1a117d847 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -17,7 +17,7 @@ defmodule Livebook.Factory do
%Livebook.Hubs.Fly{
id: "fly-foo-bar-baz",
hub_name: "My Personal Hub",
- hub_color: "#FF00FF",
+ hub_emoji: "🚀",
access_token: Livebook.Utils.random_cookie(),
organization_id: Livebook.Utils.random_id(),
organization_type: "PERSONAL",
@@ -36,7 +36,7 @@ defmodule Livebook.Factory do
%Livebook.Hubs.Enterprise{
id: "enterprise-#{id}",
hub_name: "Enterprise",
- hub_color: "#FF0000",
+ hub_emoji: "🏭",
external_id: id,
token: Livebook.Utils.random_cookie(),
url: "http://localhost"