diff --git a/src/renderer/components/layout/__test__/main-layout-header.test.tsx b/src/renderer/components/layout/__test__/main-layout-header.test.tsx index 214eabdc69..58f2079ed9 100644 --- a/src/renderer/components/layout/__test__/main-layout-header.test.tsx +++ b/src/renderer/components/layout/__test__/main-layout-header.test.tsx @@ -1,18 +1,11 @@ jest.mock("../../../../common/ipc"); import React from "react"; -import { fireEvent, render } from "@testing-library/react"; +import { render } from "@testing-library/react"; import "@testing-library/jest-dom/extend-expect"; import { MainLayoutHeader } from "../main-layout-header"; import { Cluster } from "../../../../main/cluster"; -import { broadcastMessage, requestMain } from "../../../../common/ipc"; -import { clusterDisconnectHandler } from "../../../../common/cluster-ipc"; -import { ConfirmDialog } from "../../confirm-dialog"; -import { IpcRendererNavigationEvents } from "../../../navigation/events"; - -const mockBroadcastIpc = broadcastMessage as jest.MockedFunction; -const mockRequestMain = requestMain as jest.MockedFunction; const cluster: Cluster = new Cluster({ id: "foo", @@ -40,60 +33,4 @@ describe("", () => { expect(getByText("minikube")).toBeInTheDocument(); }); - - describe("Cluster Actions Menu", () => { - let settingsBtn: Element; - let disconnectBtn: Element; - let removeBtn: Element; - - beforeEach(() => { - const { container } = render(
- - -
); - const icon = container.querySelector(".Icon"); - - cluster.online = true; - fireEvent.click(icon); - - [settingsBtn, disconnectBtn, removeBtn] = Array.from(document.querySelectorAll("ul.ClusterActionsMenu > li")) - .map(el => el.querySelector("span")); - }); - - afterEach(() => { - cluster.online = false; - }); - - it("renders cluster menu items", () => { - expect(settingsBtn).toBeDefined(); - expect(settingsBtn.textContent).toBe("Settings"); - expect(disconnectBtn).toBeDefined(); - expect(disconnectBtn.textContent).toBe("Disconnect"); - expect(removeBtn).toBeDefined(); - expect(removeBtn.textContent).toBe("Remove"); - }); - - it("navigates to cluster settings", () => { - fireEvent.click(settingsBtn); - expect(mockBroadcastIpc).toBeCalledWith(IpcRendererNavigationEvents.NAVIGATE_IN_APP, "/cluster/foo/settings"); - }); - - it("disconnects from cluster", () => { - fireEvent.click(disconnectBtn); - expect(mockRequestMain).toBeCalledWith(clusterDisconnectHandler, cluster.id); - }); - - it("opens 'Remove cluster' dialog", async () => { - fireEvent.click(removeBtn); - - const dialog = document.querySelector(".ConfirmDialog"); - - expect(dialog).toBeDefined(); - expect(dialog).not.toBe(null); - - const okBtn = dialog.querySelector("button.ok"); - - expect(okBtn.textContent).toBe("Remove"); - }); - }); }); diff --git a/src/renderer/components/layout/main-layout-header.tsx b/src/renderer/components/layout/main-layout-header.tsx index 4fb6b69f9b..e034ea6907 100644 --- a/src/renderer/components/layout/main-layout-header.tsx +++ b/src/renderer/components/layout/main-layout-header.tsx @@ -1,10 +1,7 @@ import React from "react"; import { observer } from "mobx-react"; - -import { ClusterActions } from "../cluster-manager"; import { Cluster } from "../../../main/cluster"; import { cssNames } from "../../utils"; -import { MenuActions, MenuItem } from "../menu"; interface Props { cluster: Cluster @@ -12,28 +9,9 @@ interface Props { } export const MainLayoutHeader = observer(({ cluster, className }: Props) => { - const actions = ClusterActions(cluster); - const renderMenu = () => ( - - - Settings - - - Disconnect - - { - !cluster.isManaged && ( - - Remove - - ) - } - ); - return (
{cluster.name} - {renderMenu()}
); });