diff --git a/src/features/cluster/__snapshots__/cluster-modal-items.test.tsx.snap b/src/features/cluster/__snapshots__/cluster-modal-items.test.tsx.snap index 344ed10635..708dcc9718 100644 --- a/src/features/cluster/__snapshots__/cluster-modal-items.test.tsx.snap +++ b/src/features/cluster/__snapshots__/cluster-modal-items.test.tsx.snap @@ -1,11 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[` elements originated from cluster modal registration given custom component for cluster view not available renders 1`] = ` +exports[` elements originated from cluster frame component registration given custom components for cluster view available renders 1`] = `
-
@@ -509,523 +505,10 @@ exports[` elements originated from cluster modal registration given custo
- -`; - -exports[` elements originated from cluster modal registration given custom components for cluster view available renders 1`] = ` -
-
- test modal -
-
-
-
-
-
-
-
- ?? -
-
-
-
-
- - - - - - Workloads - - - - keyboard_arrow_down - - - -
-
- - - - list - - - - Config - - -
-
- - - - device_hub - - - - Network - - - - keyboard_arrow_down - - - -
-
- - - - storage - - - - Storage - - -
-
- - - - - - Helm - - - - keyboard_arrow_down - - - -
-
- - - - security - - - - Access Control - - -
-
- - - - extension - - - - Custom Resources - - - - keyboard_arrow_down - - - -
-
-
-
-
-
-
-
- -
-
-
-
-
- Overview -
-
-
- - -
-
-
- All namespaces -
-
- -
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- - - add - - -
- New tab -
-
- - - fullscreen - - -
- Fit to window -
- - - keyboard_arrow_up - - -
- Open -
-
-
-
-
+ test modal
`; diff --git a/src/features/cluster/cluster-modal-items.test.tsx b/src/features/cluster/cluster-modal-items.test.tsx index 4f41c23215..d02995798c 100644 --- a/src/features/cluster/cluster-modal-items.test.tsx +++ b/src/features/cluster/cluster-modal-items.test.tsx @@ -2,18 +2,14 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { Injectable } from "@ogre-tools/injectable"; -import { getInjectable } from "@ogre-tools/injectable"; -import type { RenderResult } from "@testing-library/react"; +import { act, RenderResult } from "@testing-library/react"; import type { IObservableValue } from "mobx"; import { computed, observable, runInAction } from "mobx"; import React from "react"; -import type { ClusterModalRegistration } from "../../extensions/registries"; -import { clusterModalsInjectionToken } from "../../renderer/cluster-modals/cluster-modals-injection-token"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -describe(" elements originated from cluster modal registration", () => { +describe(" elements originated from cluster frame component registration", () => { let builder: ApplicationBuilder; let rendered: RenderResult; @@ -24,48 +20,32 @@ describe(" elements originated from cluster modal registration", () => { describe("given custom components for cluster view available", () => { let someObservable: IObservableValue; - let clusterModalInjectable: Injectable; - let clusterDialogInjectable: Injectable; beforeEach(async () => { someObservable = observable.box(false); - clusterModalInjectable = getInjectable({ - id: "some-cluster-modal-injectable", - - instantiate: () => { - return { - id: "test-modal-id", - Component: () =>
test modal
, - visible: computed(() => true), - }; - }, - - injectionToken: clusterModalsInjectionToken, - }); + const testExtension = { + id: "some-extension-id", + name: "some-extension-name", - clusterDialogInjectable = getInjectable({ - id: "dialog-with-observable-visibility-injectable", - - instantiate: () => { - return { - id: "dialog-with-observable-visibility-id", - Component: () =>
dialog contents
, - visible: computed(() => someObservable.get()), - }; + rendererOptions: { + clusterFrameComponents: [ + { + id: "test-modal-id", + Component: () =>
test modal
, + shouldRender: computed(() => true), + }, + { + id: "dialog-with-observable-visibility-id", + Component: () =>
dialog contents
, + shouldRender: computed(() => someObservable.get()), + } + ] }, - - injectionToken: clusterModalsInjectionToken, - }); - - builder.beforeWindowStart((windowDi) => { - runInAction(() => { - windowDi.register(clusterModalInjectable); - windowDi.register(clusterDialogInjectable); - }); - }); + }; rendered = await builder.render(); + builder.extensions.enable(testExtension); }); it("renders", () => { @@ -86,7 +66,7 @@ describe(" elements originated from cluster modal registration", () => { it("when injectable component becomes visible, shows it", () => { runInAction(() => { - someObservable.set(true); + act(() => someObservable.set(true)); }); const dialog = rendered.getByTestId("dialog-with-observable-visibility"); @@ -94,20 +74,4 @@ describe(" elements originated from cluster modal registration", () => { expect(dialog).toBeInTheDocument(); }); }); - - describe("given custom component for cluster view not available", () => { - beforeEach(async () => { - rendered = await builder.render(); - }); - - it("renders", () => { - expect(rendered.container).toMatchSnapshot(); - }); - - it("doesn't render any custom html", () => { - const modal = rendered.queryByTestId("test-modal"); - - expect(modal).not.toBeInTheDocument(); - }); - }); });