From 9276df05924794d30d7d97bc79cf701a6106e8ec Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 23 May 2023 09:09:13 -0400 Subject: [PATCH] Revert "chore: Fixup tests snapshots to match new testid behaviour" This reverts commit e6bef1a168649107db1755160327455fcbe90030. --- .../src/order-of-sidebar-items.test.ts | 174 -- .../custom-resources-in-sidebar.test.tsx.snap | 156 +- ...ing-cluster-frame-components.test.tsx.snap | 121 +- .../order-of-sidebar-items.test.tsx.snap | 1259 ++++++++ ...-and-tab-navigation-for-core.test.tsx.snap | 910 +++++- ...ab-navigation-for-extensions.test.tsx.snap | 1176 +++++++- .../visibility-of-sidebar-items.test.tsx.snap | 248 +- .../workload-overview.test.tsx.snap | 123 +- .../custom-resources-in-sidebar.test.tsx | 16 +- ...when-cluster-is-not-relevant.test.tsx.snap | 365 ++- ...when-cluster-is-not-relevant.test.tsx.snap | 367 ++- ...tems-when-cluster-is-not-relevant.test.tsx | 27 +- ...when-cluster-is-not-relevant.test.tsx.snap | 363 ++- ...hide-kube-object-detail-item.test.tsx.snap | 242 +- ...when-cluster-is-not-relevant.test.tsx.snap | 357 ++- ...how-status-for-a-kube-object.test.tsx.snap | 714 ++++- ...when-cluster-is-not-relevant.test.tsx.snap | 357 ++- .../edit-namespace-from-new-tab.test.tsx.snap | 1936 ++++++++++++- ...e-from-previously-opened-tab.test.tsx.snap | 246 +- .../cluster/order-of-sidebar-items.test.tsx | 151 + ...debar-and-tab-navigation-for-core.test.tsx | 32 +- ...and-tab-navigation-for-extensions.test.tsx | 18 +- .../visibility-of-sidebar-items.test.tsx | 2 +- .../__snapshots__/pods.test.tsx.snap | 369 ++- ...when-cluster-is-not-relevant.test.tsx.snap | 363 ++- ...lling-helm-chart-from-new-tab.test.ts.snap | 2581 +++++++++++++++-- ...rt-from-previously-opened-tab.test.ts.snap | 242 +- ...tab-for-installing-helm-chart.test.ts.snap | 1107 ++++++- .../upgrade-chart-new-tab.test.ts.snap | 861 +++++- ...wing-details-for-helm-release.test.ts.snap | 2214 +++++++++++++- .../route-with-sub-namespaces.test.tsx.snap | 363 ++- .../__snapshots__/download-logs.test.tsx.snap | 242 +- ...on-sidebar-item-registrator.injectable.tsx | 97 +- .../__snapshots__/cluster-frame.test.tsx.snap | 373 ++- .../routes/route-is-active.injectable.ts | 11 +- 35 files changed, 16774 insertions(+), 1409 deletions(-) delete mode 100644 packages/cluster-sidebar/src/order-of-sidebar-items.test.ts create mode 100644 packages/core/src/features/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap create mode 100644 packages/core/src/features/cluster/order-of-sidebar-items.test.tsx diff --git a/packages/cluster-sidebar/src/order-of-sidebar-items.test.ts b/packages/cluster-sidebar/src/order-of-sidebar-items.test.ts deleted file mode 100644 index 6d04343688..0000000000 --- a/packages/cluster-sidebar/src/order-of-sidebar-items.test.ts +++ /dev/null @@ -1,174 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { createContainer, DiContainer, getInjectable } from "@ogre-tools/injectable"; -import { computed, IComputedValue } from "mobx"; -import { noop } from "lodash/fp"; -import sidebarItemsInjectable from "./sidebar-items.injectable"; -import { SidebarItemDeclaration, sidebarItemInjectionToken } from "./tokens"; -import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; -import { clusterSidebarFeature } from "./feature"; - -const someParentSidebarItemInjectable = getInjectable({ - id: "sidebar-item-some-parent", - instantiate: () => ({ - parentId: null, - title: "Some parent", - onClick: noop, - orderNumber: 42, - }), - injectionToken: sidebarItemInjectionToken, -}); - -const someOtherParentSidebarItemInjectable = getInjectable({ - id: "sidebar-item-some-other-parent", - instantiate: () => ({ - parentId: null, - title: "Some other parent", - onClick: noop, - orderNumber: 126, - }), - injectionToken: sidebarItemInjectionToken, -}); - -const someAnotherParentSidebarItemInjectable = getInjectable({ - id: "sidebar-item-some-another-parent", - instantiate: () => ({ - parentId: null, - title: "Some another parent", - onClick: noop, - orderNumber: 84, - }), - injectionToken: sidebarItemInjectionToken, -}); - -const someForthParentSidebarItemInjectable = getInjectable({ - id: "sidebar-item-some-forth-parent", - instantiate: () => ({ - parentId: null, - title: "Some another parent", - onClick: noop, - orderNumber: 84, - isVisible: computed(() => false), - isActive: computed(() => true), - }), - injectionToken: sidebarItemInjectionToken, -}); - -const someChildSidebarItemInjectable = getInjectable({ - id: "sidebar-item-some-child", - instantiate: () => ({ - parentId: someParentSidebarItemInjectable.id, - title: "Some child", - onClick: noop, - orderNumber: 168, - }), - injectionToken: sidebarItemInjectionToken, -}); - -const someOtherChildSidebarItemInjectable = getInjectable({ - id: "sidebar-item-some-other-child", - instantiate: () => ({ - parentId: someParentSidebarItemInjectable.id, - title: "Some other child", - onClick: noop, - orderNumber: 252, - }), - injectionToken: sidebarItemInjectionToken, -}); - -const someAnotherChildSidebarItemInjectable = getInjectable({ - id: "sidebar-item-some-another-child", - instantiate: () => ({ - parentId: someParentSidebarItemInjectable.id, - title: "Some another child", - onClick: noop, - orderNumber: 210, - }), - injectionToken: sidebarItemInjectionToken, -}); - -describe("order of sidebar items", () => { - let di: DiContainer; - let sidebarItems: IComputedValue; - - beforeEach(() => { - di = createContainer("test"); - - di.register( - someParentSidebarItemInjectable, - someOtherParentSidebarItemInjectable, - someAnotherParentSidebarItemInjectable, - someChildSidebarItemInjectable, - someOtherChildSidebarItemInjectable, - someAnotherChildSidebarItemInjectable, - someForthParentSidebarItemInjectable, - ); - - clusterSidebarFeature.register(di); - registerMobX(di); - - sidebarItems = di.inject(sidebarItemsInjectable); - }); - - it("has parent items in order", () => { - const actual = sidebarItems.get().map((item) => item.id); - - expect(actual).toEqual([ - "sidebar-item-some-parent", - "sidebar-item-some-another-parent", - "sidebar-item-some-forth-parent", - "sidebar-item-some-other-parent", - ]); - }); - - it("an item with no children and no isVisible configuration by default is visible", () => { - const item = sidebarItems.get().find((item) => item.id === someAnotherParentSidebarItemInjectable.id); - - expect(item?.isVisible.get()).toBe(true); - }); - - it("an item with no children and an isVisible configuration is whatever the configuration specifies", () => { - const item = sidebarItems.get().find((item) => item.id === someForthParentSidebarItemInjectable.id); - - expect(item?.isVisible.get()).toBe(false); - }); - - it("an item with children is visible if at least one of the children is visible", () => { - const item = sidebarItems.get().find((item) => item.id === "sidebar-item-some-parent"); - - expect(item?.isVisible.get()).toBe(true); - }); - - it("an item with no children and no isActive configuration by default is not active", () => { - const item = sidebarItems.get().find((item) => item.id === someAnotherParentSidebarItemInjectable.id); - - expect(item?.isActive.get()).toBe(false); - }); - - it("an item with no children and an isActive configuration is whatever the configuration specifies", () => { - const item = sidebarItems.get().find((item) => item.id === someForthParentSidebarItemInjectable.id); - - expect(item?.isActive.get()).toBe(true); - }); - - it("an item with children is active if at least one of the children is active", () => { - const item = sidebarItems.get().find((item) => item.id === "sidebar-item-some-parent"); - - expect(item?.isActive.get()).toBe(false); - }); - - it("has child items in order", () => { - const actual = sidebarItems - .get() - .find((item) => item.id === "sidebar-item-some-parent") - ?.children.map((item) => item.id); - - expect(actual).toEqual([ - "sidebar-item-some-child", - "sidebar-item-some-another-child", - "sidebar-item-some-other-child", - ]); - }); -}); diff --git a/packages/core/src/features/cluster/__snapshots__/custom-resources-in-sidebar.test.tsx.snap b/packages/core/src/features/cluster/__snapshots__/custom-resources-in-sidebar.test.tsx.snap index d71a106fae..7ec3ae37ee 100644 --- a/packages/core/src/features/cluster/__snapshots__/custom-resources-in-sidebar.test.tsx.snap +++ b/packages/core/src/features/cluster/__snapshots__/custom-resources-in-sidebar.test.tsx.snap @@ -78,7 +78,7 @@ exports[`cluster - custom resources in sidebar renders 1`] = ` @@ -519,7 +519,7 @@ exports[`cluster - custom resources in sidebar when custom resource definitions @@ -996,7 +996,7 @@ exports[`cluster - custom resources in sidebar when custom resource exists rende @@ -1437,7 +1437,7 @@ exports[`cluster - custom resources in sidebar when custom resource exists when @@ -1914,7 +1914,7 @@ exports[`cluster - custom resources in sidebar when custom resource exists when @@ -2084,7 +2084,7 @@ exports[`cluster - custom resources in sidebar when custom resource exists when