From 0d480917cf2787e34a243784ee5bc98d716b2a4f Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Tue, 7 Mar 2023 19:23:57 +0200 Subject: [PATCH] Simplify test setup by removing option for global overrides (#7302) * Remove option to doGeneralOverrides and do it always Signed-off-by: Janne Savolainen * Override telemetry by default to optimize and simplify testing Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen * Simplify more usages of getDiForUnitTesting Signed-off-by: Janne Savolainen * Fix code style Signed-off-by: Janne Savolainen --------- Signed-off-by: Janne Savolainen --- .../common/__tests__/cluster-store.test.ts | 2 +- .../__tests__/create-resource-stack.test.ts | 2 +- .../src/common/__tests__/hotbar-store.test.ts | 2 +- .../src/common/__tests__/user-store.test.ts | 2 +- .../__tests__/kubernetes-cluster.test.ts | 2 +- ...request-namespace-list-permissions.test.ts | 2 +- ...at-all-routes-have-route-component.test.ts | 2 +- .../common/initializable-state/create.test.ts | 2 +- .../k8s-api/__tests__/api-manager.test.ts | 2 +- .../k8s-api/__tests__/deployment.api.test.ts | 2 +- .../kube-api-version-detection.test.ts | 2 +- .../common/k8s-api/__tests__/kube-api.test.ts | 4 +- .../__tests__/stateful-set.api.test.ts | 2 +- .../with-error-logging.test.ts | 4 +- .../with-orphan-promise.test.ts | 2 +- .../__tests__/extension-loader.test.ts | 2 +- .../extension-discovery.test.ts | 2 +- ...ure-hashed-directory-for-extension.test.ts | 2 +- .../check-for-platform-updates.test.ts | 2 + .../download-platform-update.test.ts | 2 + .../compute-unix-shell-environment.test.ts | 4 +- ...metry-from-specific-function-calls.test.ts | 5 +- ...ecorator.global-override-for-injectable.ts | 11 ++++ .../core/src/main/__test__/cluster.test.ts | 2 +- .../src/main/__test__/context-handler.test.ts | 2 +- .../src/main/__test__/kube-auth-proxy.test.ts | 2 +- .../main/__test__/kubeconfig-manager.test.ts | 2 +- .../main/__test__/static-file-route.test.ts | 2 +- .../get-electron-app-path.test.ts | 4 +- .../__test__/kubeconfig-sync.test.ts | 2 +- .../__tests__/catalog-entity-registry.test.ts | 2 +- .../detect-cluster-metadata.test.ts | 2 +- packages/core/src/main/getDiForUnitTesting.ts | 54 ++++++++---------- .../main/helm/__tests__/helm-service.test.ts | 2 +- .../exec-file-with-input.test.ts | 2 +- .../get-helm-release-resources.test.ts | 2 +- .../protocol-handler/__test__/router.test.ts | 2 +- packages/core/src/main/router/router.test.ts | 2 +- .../local-shell-session/techincal.test.ts | 4 +- .../enlist-message-channel-listener.test.ts | 2 +- .../enlist-request-channel-listener.test.ts | 2 +- .../utils/channel/message-to-channel.test.ts | 2 +- ...resolve-system-proxy-from-electron.test.ts | 2 +- .../__tests__/catalog-entity-registry.test.ts | 2 +- .../api/__tests__/websocket-api.test.ts | 2 +- .../__tests__/catalog-add-button.test.tsx | 2 +- .../__tests__/catalog-entity-store.test.ts | 2 +- .../+catalog/__tests__/custom-columns.test.ts | 2 +- .../+catalog/__tests__/custom-views.test.ts | 2 +- .../hpa-details.test.tsx | 2 +- .../__tests__/secret-details.test.tsx | 2 +- .../custom-resource-details.test.tsx | 2 +- .../+extensions/__tests__/extensions.test.tsx | 2 +- .../namespace-select-filter.test.tsx | 2 +- .../+namespaces/namespace-store.test.ts | 2 +- .../+namespaces/namespace-tree-view.test.tsx | 2 +- .../__tests__/network-policy-details.test.tsx | 2 +- .../__tests__/dialog.test.tsx | 2 +- .../+role-bindings/__tests__/dialog.test.tsx | 2 +- .../+welcome/__test__/welcome.test.tsx | 2 +- .../scale/dialog.test.tsx | 2 +- .../__tests__/pod-container-env.test.tsx | 2 +- .../__tests__/pod-tolerations.test.tsx | 2 +- .../variants/__tests__/ceph-fs.test.tsx | 2 +- .../scale-dialog/dialog.test.tsx | 2 +- .../scale/dialog.test.tsx | 2 +- .../__tests__/cronjob.store.test.ts | 2 +- .../__tests__/daemonset.store.test.ts | 2 +- .../__tests__/deployments.store.test.ts | 2 +- .../components/__tests__/job.store.test.ts | 2 +- .../components/__tests__/pods.store.test.ts | 2 +- .../__tests__/replicaset.store.test.ts | 2 +- .../__tests__/statefulset.store.test.ts | 2 +- .../avatar/__tests__/avatar.test.tsx | 2 +- .../cluster-local-terminal-settings.test.tsx | 2 +- .../dock/__test__/dock-store.test.ts | 2 +- .../__test__/log-resource-selector.test.tsx | 2 +- .../dock/logs/__test__/log-search.test.tsx | 2 +- .../dock/logs/__test__/to-bottom.test.tsx | 2 +- .../drawer/drawer-param-toggler.test.tsx | 2 +- .../__tests__/hotbar-remove-command.test.tsx | 2 +- .../kube-object-list-layout.test.tsx | 2 +- .../kube-object-menu.test.tsx | 2 +- .../layout/__tests__/sidebar-cluster.test.tsx | 2 +- .../layout/top-bar/top-bar.test.tsx | 2 +- ...et-editor-height-from-lines-number.test.ts | 4 +- .../__tests__/render-delay.test.tsx | 2 +- .../scroll-spy/__tests__/scroll-spy.test.tsx | 4 +- .../components/select/select.test.tsx | 2 +- .../test-utils/get-application-builder.tsx | 6 +- .../cluster-frame/cluster-frame.test.tsx | 2 +- .../core/src/renderer/getDiForUnitTesting.tsx | 56 +++++++++---------- .../search-store/search-store.test.ts | 2 +- .../utils/__tests__/storage-helper.test.ts | 2 +- .../enlist-message-channel-listener.test.ts | 2 +- 95 files changed, 165 insertions(+), 161 deletions(-) create mode 100644 packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts diff --git a/packages/core/src/common/__tests__/cluster-store.test.ts b/packages/core/src/common/__tests__/cluster-store.test.ts index bbb6457e43..b30bc8178d 100644 --- a/packages/core/src/common/__tests__/cluster-store.test.ts +++ b/packages/core/src/common/__tests__/cluster-store.test.ts @@ -67,7 +67,7 @@ describe("cluster-store", () => { let writeFileSyncAndReturnPath: (filePath: string, contents: string) => string; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); di.override(directoryForTempInjectable, () => "/some-temp-directory"); diff --git a/packages/core/src/common/__tests__/create-resource-stack.test.ts b/packages/core/src/common/__tests__/create-resource-stack.test.ts index 340e5c86ee..5bf9cb1fe7 100644 --- a/packages/core/src/common/__tests__/create-resource-stack.test.ts +++ b/packages/core/src/common/__tests__/create-resource-stack.test.ts @@ -17,7 +17,7 @@ describe("create resource stack tests", () => { let cluster: KubernetesCluster; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); cluster = { getId: () => "test-cluster", } as any; diff --git a/packages/core/src/common/__tests__/hotbar-store.test.ts b/packages/core/src/common/__tests__/hotbar-store.test.ts index ac8cecc1d2..474ebc1618 100644 --- a/packages/core/src/common/__tests__/hotbar-store.test.ts +++ b/packages/core/src/common/__tests__/hotbar-store.test.ts @@ -43,7 +43,7 @@ describe("HotbarStore", () => { let loggerMock: jest.Mocked; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); testCluster = getMockCatalogEntity({ apiVersion: "v1", diff --git a/packages/core/src/common/__tests__/user-store.test.ts b/packages/core/src/common/__tests__/user-store.test.ts index 486bb31bef..fb8d020fb0 100644 --- a/packages/core/src/common/__tests__/user-store.test.ts +++ b/packages/core/src/common/__tests__/user-store.test.ts @@ -21,7 +21,7 @@ describe("user store tests", () => { let di: DiContainer; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(writeFileInjectable, () => () => Promise.resolve()); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); diff --git a/packages/core/src/common/catalog-entities/__tests__/kubernetes-cluster.test.ts b/packages/core/src/common/catalog-entities/__tests__/kubernetes-cluster.test.ts index b2814f9785..d681713a80 100644 --- a/packages/core/src/common/catalog-entities/__tests__/kubernetes-cluster.test.ts +++ b/packages/core/src/common/catalog-entities/__tests__/kubernetes-cluster.test.ts @@ -12,7 +12,7 @@ describe("kubernetesClusterCategory", () => { let kubernetesClusterCategory: KubernetesClusterCategory; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); kubernetesClusterCategory = di.inject(kubernetesClusterCategoryInjectable); }); diff --git a/packages/core/src/common/cluster/request-namespace-list-permissions.test.ts b/packages/core/src/common/cluster/request-namespace-list-permissions.test.ts index 9734683404..c62f69ca8e 100644 --- a/packages/core/src/common/cluster/request-namespace-list-permissions.test.ts +++ b/packages/core/src/common/cluster/request-namespace-list-permissions.test.ts @@ -20,7 +20,7 @@ describe("requestNamespaceListPermissions", () => { let requestNamespaceListPermissions: RequestNamespaceListPermissionsFor; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); requestNamespaceListPermissions = di.inject(requestNamespaceListPermissionsForInjectable); }); diff --git a/packages/core/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts b/packages/core/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts index acd1d4401d..44f86f270d 100644 --- a/packages/core/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts +++ b/packages/core/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts @@ -12,7 +12,7 @@ import { pipeline } from "@ogre-tools/fp"; describe("verify-that-all-routes-have-component", () => { it("verify that routes have route component", () => { - const rendererDi = getDiForUnitTesting({ doGeneralOverrides: true }); + const rendererDi = getDiForUnitTesting(); rendererDi.override(clusterStoreInjectable, () => ({ getById: () => null, diff --git a/packages/core/src/common/initializable-state/create.test.ts b/packages/core/src/common/initializable-state/create.test.ts index 38980b0a41..8241aa1612 100644 --- a/packages/core/src/common/initializable-state/create.test.ts +++ b/packages/core/src/common/initializable-state/create.test.ts @@ -15,7 +15,7 @@ describe("InitializableState tests", () => { let di: DiContainer; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); }); describe("when created", () => { diff --git a/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts b/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts index bec3cff646..e6092fa417 100644 --- a/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/api-manager.test.ts @@ -37,7 +37,7 @@ describe("ApiManager", () => { let di: DiContainer; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/common/k8s-api/__tests__/deployment.api.test.ts b/packages/core/src/common/k8s-api/__tests__/deployment.api.test.ts index 60ada4e4d1..96758a5591 100644 --- a/packages/core/src/common/k8s-api/__tests__/deployment.api.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/deployment.api.test.ts @@ -15,7 +15,7 @@ describe("DeploymentApi", () => { let kubeJsonApi: jest.Mocked; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(storesAndApisCanBeCreatedInjectable, () => true); kubeJsonApi = { diff --git a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts index 16c2ae0e04..da7c46eda3 100644 --- a/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts @@ -30,7 +30,7 @@ describe("KubeApi", () => { let di: DiContainer; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); fetchMock = asyncFn(); di.override(fetchInjectable, () => fetchMock); diff --git a/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts b/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts index c5b0364da9..e2b5907d85 100644 --- a/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/kube-api.test.ts @@ -42,7 +42,7 @@ describe("createKubeApiForRemoteCluster", () => { let fetchMock: AsyncFnMock; beforeEach(async () => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); @@ -145,7 +145,7 @@ describe("KubeApi", () => { let di: DiContainer; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/common/k8s-api/__tests__/stateful-set.api.test.ts b/packages/core/src/common/k8s-api/__tests__/stateful-set.api.test.ts index b7557c8010..9b13e09f2e 100644 --- a/packages/core/src/common/k8s-api/__tests__/stateful-set.api.test.ts +++ b/packages/core/src/common/k8s-api/__tests__/stateful-set.api.test.ts @@ -15,7 +15,7 @@ describe("StatefulSetApi", () => { let kubeJsonApi: jest.Mocked; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(storesAndApisCanBeCreatedInjectable, () => true); kubeJsonApi = { diff --git a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts index b1140d4e54..1e7747a952 100644 --- a/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts +++ b/packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts @@ -18,7 +18,7 @@ describe("with-error-logging", () => { let logErrorMock: jest.Mock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); logErrorMock = jest.fn(); @@ -116,7 +116,7 @@ describe("with-error-logging", () => { let logErrorMock: jest.Mock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); logErrorMock = jest.fn(); diff --git a/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts b/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts index 51ebc18e13..a138c152e7 100644 --- a/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts +++ b/packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts @@ -14,7 +14,7 @@ describe("with orphan promise, when called", () => { let logErrorMock: jest.Mock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); logErrorMock = jest.fn(); diff --git a/packages/core/src/extensions/__tests__/extension-loader.test.ts b/packages/core/src/extensions/__tests__/extension-loader.test.ts index 1c010f7640..92de69590e 100644 --- a/packages/core/src/extensions/__tests__/extension-loader.test.ts +++ b/packages/core/src/extensions/__tests__/extension-loader.test.ts @@ -23,7 +23,7 @@ describe("ExtensionLoader", () => { let updateExtensionStateMock: jest.Mock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); di.override(currentlyInClusterFrameInjectable, () => false); diff --git a/packages/core/src/extensions/extension-discovery/extension-discovery.test.ts b/packages/core/src/extensions/extension-discovery/extension-discovery.test.ts index 77e9cd0623..6a8f50eda3 100644 --- a/packages/core/src/extensions/extension-discovery/extension-discovery.test.ts +++ b/packages/core/src/extensions/extension-discovery/extension-discovery.test.ts @@ -32,7 +32,7 @@ describe("ExtensionDiscovery", () => { let homeDirectoryPath: string; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); di.override(installExtensionInjectable, () => () => Promise.resolve()); diff --git a/packages/core/src/extensions/extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.test.ts b/packages/core/src/extensions/extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.test.ts index dab86f68b2..2ba20bab8c 100644 --- a/packages/core/src/extensions/extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.test.ts +++ b/packages/core/src/extensions/extension-loader/file-system-provisioner-store/ensure-hashed-directory-for-extension.test.ts @@ -18,7 +18,7 @@ describe("ensure-hashed-directory-for-extension", () => { let registeredExtensions: ObservableMap; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); ensureDirMock = jest.fn(); diff --git a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts b/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts index 07875dd728..408da4eb7d 100644 --- a/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts +++ b/packages/core/src/features/application-update/main/check-for-updates/check-for-platform-updates/check-for-platform-updates.test.ts @@ -23,6 +23,8 @@ describe("check-for-platform-updates", () => { beforeEach(() => { const di = getDiForUnitTesting(); + di.unoverride(checkForPlatformUpdatesInjectable); + checkForUpdatesMock = asyncFn(); electronUpdaterFake = { diff --git a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts b/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts index 2cedacb68b..e2716ed962 100644 --- a/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts +++ b/packages/core/src/features/application-update/main/download-update/download-platform-update/download-platform-update.test.ts @@ -26,6 +26,8 @@ describe("download-platform-update", () => { beforeEach(() => { di = getDiForUnitTesting(); + di.unoverride(downloadPlatformUpdateInjectable); + downloadUpdateMock = asyncFn(); electronUpdaterOnMock = jest.fn(); electronUpdaterOffMock = jest.fn(); diff --git a/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.test.ts b/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.test.ts index a540824286..a56473b474 100644 --- a/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.test.ts +++ b/packages/core/src/features/shell-sync/main/compute-unix-shell-environment.test.ts @@ -37,9 +37,7 @@ describe("computeUnixShellEnvironment technical tests", () => { let unixShellEnv: ReturnType; beforeEach(() => { - di = getDiForUnitTesting({ - doGeneralOverrides: true, - }); + di = getDiForUnitTesting(); spawnMock = jest.fn().mockImplementation((spawnfile, spawnargs) => { shellStdin = new MemoryStream(); diff --git a/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts b/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts index c6ea8b25e2..4185640ebc 100644 --- a/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts +++ b/packages/core/src/features/telemetry/emit-telemetry-from-specific-function-calls.test.ts @@ -9,12 +9,15 @@ import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting"; import telemetryWhiteListForFunctionsInjectable from "./renderer/telemetry-white-list-for-functions.injectable"; import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable"; import logErrorInjectable from "../../common/log-error.injectable"; +import telemetryDecoratorInjectable from "./renderer/telemetry-decorator.injectable"; describe("emit-telemetry-from-specific-function-calls", () => { let di: DiContainer; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); + + di.unoverride(telemetryDecoratorInjectable); }); describe("given a telemetry white-list for injectables which instantiate a function", () => { diff --git a/packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts b/packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts new file mode 100644 index 0000000000..e163a53862 --- /dev/null +++ b/packages/core/src/features/telemetry/renderer/telemetry-decorator.global-override-for-injectable.ts @@ -0,0 +1,11 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { identity } from "lodash/fp"; +import { getGlobalOverride } from "../../../common/test-utils/get-global-override"; +import telemetryDecoratorInjectable from "./telemetry-decorator.injectable"; + +export default getGlobalOverride(telemetryDecoratorInjectable, () => ({ + decorate: identity, +})); diff --git a/packages/core/src/main/__test__/cluster.test.ts b/packages/core/src/main/__test__/cluster.test.ts index be19790a23..721188d059 100644 --- a/packages/core/src/main/__test__/cluster.test.ts +++ b/packages/core/src/main/__test__/cluster.test.ts @@ -31,7 +31,7 @@ describe("create clusters", () => { beforeEach(() => { jest.clearAllMocks(); - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); const clusterServerUrl = "https://192.168.64.3:8443"; di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); diff --git a/packages/core/src/main/__test__/context-handler.test.ts b/packages/core/src/main/__test__/context-handler.test.ts index 5d11dbdf70..e6ac1cce8c 100644 --- a/packages/core/src/main/__test__/context-handler.test.ts +++ b/packages/core/src/main/__test__/context-handler.test.ts @@ -53,7 +53,7 @@ describe("ContextHandler", () => { let di: DiContainer; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(createKubeAuthProxyInjectable, () => ({} as any)); createContextHandler = di.inject(createContextHandlerInjectable); diff --git a/packages/core/src/main/__test__/kube-auth-proxy.test.ts b/packages/core/src/main/__test__/kube-auth-proxy.test.ts index 4f8bf9ba29..5864259712 100644 --- a/packages/core/src/main/__test__/kube-auth-proxy.test.ts +++ b/packages/core/src/main/__test__/kube-auth-proxy.test.ts @@ -39,7 +39,7 @@ describe("kube auth proxy tests", () => { let getBasenameOfPath: GetBasenameOfPath; beforeEach(async () => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); di.override(directoryForTempInjectable, () => "/some-directory-for-temp"); diff --git a/packages/core/src/main/__test__/kubeconfig-manager.test.ts b/packages/core/src/main/__test__/kubeconfig-manager.test.ts index 689ef13ce8..4ccb88ba45 100644 --- a/packages/core/src/main/__test__/kubeconfig-manager.test.ts +++ b/packages/core/src/main/__test__/kubeconfig-manager.test.ts @@ -46,7 +46,7 @@ describe("kubeconfig manager tests", () => { let ensureServerMock: AsyncFnMock<() => Promise>; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(directoryForTempInjectable, () => "/some-directory-for-temp"); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); diff --git a/packages/core/src/main/__test__/static-file-route.test.ts b/packages/core/src/main/__test__/static-file-route.test.ts index abbff48a4e..0186cbea02 100644 --- a/packages/core/src/main/__test__/static-file-route.test.ts +++ b/packages/core/src/main/__test__/static-file-route.test.ts @@ -11,7 +11,7 @@ describe("static-file-route", () => { let handleStaticFileRoute: Route; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); handleStaticFileRoute = di.inject(staticFileRouteInjectable); }); diff --git a/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts b/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts index ca30b690b9..f6255cdf99 100644 --- a/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts +++ b/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts @@ -11,7 +11,9 @@ describe("get-electron-app-path", () => { let getElectronAppPath: (name: string) => string; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: false }); + const di = getDiForUnitTesting(); + + di.unoverride(getElectronAppPathInjectable); const appStub = { name: "some-app-name", diff --git a/packages/core/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts b/packages/core/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts index 6f3a8e3e0b..8dbdb87d47 100644 --- a/packages/core/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts +++ b/packages/core/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts @@ -43,7 +43,7 @@ describe("kubeconfig-sync.source tests", () => { let di: DiContainer; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); di.override(directoryForTempInjectable, () => "/some-directory-for-temp"); diff --git a/packages/core/src/main/catalog/__tests__/catalog-entity-registry.test.ts b/packages/core/src/main/catalog/__tests__/catalog-entity-registry.test.ts index e1004ed161..c7cf5f1e16 100644 --- a/packages/core/src/main/catalog/__tests__/catalog-entity-registry.test.ts +++ b/packages/core/src/main/catalog/__tests__/catalog-entity-registry.test.ts @@ -65,7 +65,7 @@ describe("CatalogEntityRegistry", () => { }); beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); entityRegistry = di.inject(catalogEntityRegistryInjectable); }); diff --git a/packages/core/src/main/cluster-detectors/detect-cluster-metadata.test.ts b/packages/core/src/main/cluster-detectors/detect-cluster-metadata.test.ts index 387e365227..496e176afb 100644 --- a/packages/core/src/main/cluster-detectors/detect-cluster-metadata.test.ts +++ b/packages/core/src/main/cluster-detectors/detect-cluster-metadata.test.ts @@ -24,7 +24,7 @@ describe("detect-cluster-metadata", () => { let cluster: Cluster; beforeEach(async () => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); const lastSeenDetectMock = jest.fn().mockReturnValue(Promise.resolve({ value: "some-time-stamp", accuracy: 100 })); const nodeCountDetectMock = jest.fn().mockReturnValue(Promise.resolve({ value: 42, accuracy: 100 })); diff --git a/packages/core/src/main/getDiForUnitTesting.ts b/packages/core/src/main/getDiForUnitTesting.ts index 23090f28e9..9720dcfda3 100644 --- a/packages/core/src/main/getDiForUnitTesting.ts +++ b/packages/core/src/main/getDiForUnitTesting.ts @@ -33,11 +33,7 @@ import { } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; -export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) { - const { - doGeneralOverrides = false, - } = opts; - +export function getDiForUnitTesting() { const di = createContainer("main"); registerMobX(di); @@ -56,34 +52,32 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) } }); - if (doGeneralOverrides) { - for (const globalOverridePath of global.injectablePaths.main.globalOverridePaths) { - const globalOverride = require(globalOverridePath).default as GlobalOverride; + for (const globalOverridePath of global.injectablePaths.main.globalOverridePaths) { + const globalOverride = require(globalOverridePath).default as GlobalOverride; - di.override(globalOverride.injectable, globalOverride.overridingInstantiate); - } - - di.override(electronInjectable, () => ({})); - di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {}); - - overrideRunnablesHavingSideEffects(di); - overrideElectronFeatures(di); - getOverrideFsWithFakes()(di); - - di.override(clusterFramesInjectable, () => observable.map()); - - di.override(broadcastMessageInjectable, () => (channel) => { - throw new Error(`Tried to broadcast message to channel "${channel}" over IPC without explicit override.`); - }); - di.override(spawnInjectable, () => () => { - return { - stderr: { on: jest.fn(), removeAllListeners: jest.fn() }, - stdout: { on: jest.fn(), removeAllListeners: jest.fn() }, - on: jest.fn(), - } as never; - }); + di.override(globalOverride.injectable, globalOverride.overridingInstantiate); } + di.override(electronInjectable, () => ({})); + di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {}); + + overrideRunnablesHavingSideEffects(di); + overrideElectronFeatures(di); + getOverrideFsWithFakes()(di); + + di.override(clusterFramesInjectable, () => observable.map()); + + di.override(broadcastMessageInjectable, () => (channel) => { + throw new Error(`Tried to broadcast message to channel "${channel}" over IPC without explicit override.`); + }); + di.override(spawnInjectable, () => () => { + return { + stderr: { on: jest.fn(), removeAllListeners: jest.fn() }, + stdout: { on: jest.fn(), removeAllListeners: jest.fn() }, + on: jest.fn(), + } as never; + }); + return di; } diff --git a/packages/core/src/main/helm/__tests__/helm-service.test.ts b/packages/core/src/main/helm/__tests__/helm-service.test.ts index 78d00b939c..7c9a5a9d02 100644 --- a/packages/core/src/main/helm/__tests__/helm-service.test.ts +++ b/packages/core/src/main/helm/__tests__/helm-service.test.ts @@ -16,7 +16,7 @@ describe("Helm Service tests", () => { let getActiveHelmRepositoriesMock: jest.Mock>>; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); getActiveHelmRepositoriesMock = jest.fn(); diff --git a/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/exec-file-with-input/exec-file-with-input.test.ts b/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/exec-file-with-input/exec-file-with-input.test.ts index 3468a9cb31..68a49c0cf6 100644 --- a/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/exec-file-with-input/exec-file-with-input.test.ts +++ b/packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/exec-file-with-input/exec-file-with-input.test.ts @@ -21,7 +21,7 @@ describe("exec-file-with-input", () => { }; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.unoverride(execFileWithInputInjectable); diff --git a/packages/core/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts b/packages/core/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts index b10bb650f1..cb1abe7f11 100644 --- a/packages/core/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts +++ b/packages/core/src/main/helm/helm-service/get-helm-release-resources/get-helm-release-resources.test.ts @@ -21,7 +21,7 @@ describe("get helm release resources", () => { let execFileWithStreamInputMock: AsyncFnMock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); execHelmMock = asyncFn(); execFileWithStreamInputMock = asyncFn(); diff --git a/packages/core/src/main/protocol-handler/__test__/router.test.ts b/packages/core/src/main/protocol-handler/__test__/router.test.ts index a06c3b057b..beb40116ed 100644 --- a/packages/core/src/main/protocol-handler/__test__/router.test.ts +++ b/packages/core/src/main/protocol-handler/__test__/router.test.ts @@ -37,7 +37,7 @@ describe("protocol router tests", () => { let broadcastMessageMock: jest.Mock; beforeEach(async () => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(pathExistsInjectable, () => () => { throw new Error("tried call pathExists without override"); }); di.override(pathExistsSyncInjectable, () => () => { throw new Error("tried call pathExistsSync without override"); }); diff --git a/packages/core/src/main/router/router.test.ts b/packages/core/src/main/router/router.test.ts index 482cafb0d5..4f3aee844e 100644 --- a/packages/core/src/main/router/router.test.ts +++ b/packages/core/src/main/router/router.test.ts @@ -28,7 +28,7 @@ describe("router", () => { beforeEach(async () => { routeHandlerMock = asyncFn(); - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(parseRequestInjectable, () => () => Promise.resolve({ payload: "some-payload", diff --git a/packages/core/src/main/shell-session/local-shell-session/techincal.test.ts b/packages/core/src/main/shell-session/local-shell-session/techincal.test.ts index 5c471d923e..17d9aa3349 100644 --- a/packages/core/src/main/shell-session/local-shell-session/techincal.test.ts +++ b/packages/core/src/main/shell-session/local-shell-session/techincal.test.ts @@ -26,9 +26,7 @@ describe("technical unit tests for local shell sessions", () => { let di: DiContainer; beforeEach(() => { - di = getDiForUnitTesting({ - doGeneralOverrides: true, - }); + di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); di.override(buildVersionInjectable, () => ({ diff --git a/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts b/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts index 407ffabd8f..2bb5f7b10f 100644 --- a/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts +++ b/packages/core/src/main/utils/channel/channel-listeners/enlist-message-channel-listener.test.ts @@ -15,7 +15,7 @@ describe("enlist message channel listener in main", () => { let offMock: jest.Mock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); onMock = jest.fn(); offMock = jest.fn(); diff --git a/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts b/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts index 2c13bbd8f9..66b81c67d9 100644 --- a/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts +++ b/packages/core/src/main/utils/channel/channel-listeners/enlist-request-channel-listener.test.ts @@ -26,7 +26,7 @@ describe("enlist request channel listener in main", () => { let offMock: jest.Mock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); handleMock = jest.fn(); offMock = jest.fn(); diff --git a/packages/core/src/main/utils/channel/message-to-channel.test.ts b/packages/core/src/main/utils/channel/message-to-channel.test.ts index 79174cf665..59e749b64b 100644 --- a/packages/core/src/main/utils/channel/message-to-channel.test.ts +++ b/packages/core/src/main/utils/channel/message-to-channel.test.ts @@ -15,7 +15,7 @@ describe("message-to-channel", () => { let sendToWindowMock: jest.Mock; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); sendToWindowMock = jest.fn(); diff --git a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts index a80a05a7cf..9c395dca5b 100644 --- a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts +++ b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts @@ -20,7 +20,7 @@ describe("technical: resolve-system-proxy-from-electron", () => { let actualPromise: Promise; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); logErrorMock = jest.fn(); di.override(logErrorInjectable, () => logErrorMock); diff --git a/packages/core/src/renderer/api/__tests__/catalog-entity-registry.test.ts b/packages/core/src/renderer/api/__tests__/catalog-entity-registry.test.ts index 7092650e5a..08dacb8f5a 100644 --- a/packages/core/src/renderer/api/__tests__/catalog-entity-registry.test.ts +++ b/packages/core/src/renderer/api/__tests__/catalog-entity-registry.test.ts @@ -80,7 +80,7 @@ describe("CatalogEntityRegistry", () => { let catalogCategoryRegistry: CatalogCategoryRegistry; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); entityRegistry = di.inject(catalogEntityRegistryInjectable); catalogCategoryRegistry = di.inject(catalogCategoryRegistryInjectable); diff --git a/packages/core/src/renderer/api/__tests__/websocket-api.test.ts b/packages/core/src/renderer/api/__tests__/websocket-api.test.ts index 8b0c4e27b7..6bc7002295 100644 --- a/packages/core/src/renderer/api/__tests__/websocket-api.test.ts +++ b/packages/core/src/renderer/api/__tests__/websocket-api.test.ts @@ -18,7 +18,7 @@ describe("WebsocketApi tests", () => { let api: TestWebSocketApi; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); api = new TestWebSocketApi({ defaultParams: di.inject(defaultWebsocketApiParamsInjectable), diff --git a/packages/core/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx b/packages/core/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx index 499f482f36..c93cdb6614 100644 --- a/packages/core/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx +++ b/packages/core/src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx @@ -31,7 +31,7 @@ describe("CatalogAddButton", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/+catalog/__tests__/catalog-entity-store.test.ts b/packages/core/src/renderer/components/+catalog/__tests__/catalog-entity-store.test.ts index 5a70657ca2..79deff6544 100644 --- a/packages/core/src/renderer/components/+catalog/__tests__/catalog-entity-store.test.ts +++ b/packages/core/src/renderer/components/+catalog/__tests__/catalog-entity-store.test.ts @@ -70,7 +70,7 @@ describe("CatalogEntityStore", () => { let di: DiContainer; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); }); describe("getTotalCount", () => { diff --git a/packages/core/src/renderer/components/+catalog/__tests__/custom-columns.test.ts b/packages/core/src/renderer/components/+catalog/__tests__/custom-columns.test.ts index 8f02be6755..8b5ed60a36 100644 --- a/packages/core/src/renderer/components/+catalog/__tests__/custom-columns.test.ts +++ b/packages/core/src/renderer/components/+catalog/__tests__/custom-columns.test.ts @@ -44,7 +44,7 @@ describe("Custom Category Columns", () => { let getCategoryColumns: (params: GetCategoryColumnsParams) => CategoryColumns; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(hotbarStoreInjectable, () => ({})); di.override(currentlyInClusterFrameInjectable, () => false); diff --git a/packages/core/src/renderer/components/+catalog/__tests__/custom-views.test.ts b/packages/core/src/renderer/components/+catalog/__tests__/custom-views.test.ts index 8a8f7fa39d..8bd996505e 100644 --- a/packages/core/src/renderer/components/+catalog/__tests__/custom-views.test.ts +++ b/packages/core/src/renderer/components/+catalog/__tests__/custom-views.test.ts @@ -16,7 +16,7 @@ describe("Custom Category Views", () => { let di: DiContainer; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); }); it("should order items correctly over all extensions", () => { diff --git a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx index 017b719841..48c2183055 100644 --- a/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx +++ b/packages/core/src/renderer/components/+config-horizontal-pod-autoscalers/hpa-details.test.tsx @@ -39,7 +39,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/+config-secrets/__tests__/secret-details.test.tsx b/packages/core/src/renderer/components/+config-secrets/__tests__/secret-details.test.tsx index 6a586bdd0c..ddd5604785 100644 --- a/packages/core/src/renderer/components/+config-secrets/__tests__/secret-details.test.tsx +++ b/packages/core/src/renderer/components/+config-secrets/__tests__/secret-details.test.tsx @@ -20,7 +20,7 @@ jest.mock("../../kube-object-meta/kube-object-meta", () => ({ describe("SecretDetails tests", () => { it("should show the visibility toggle when the secret value is ''", () => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); const render = renderFor(di); di.override(directoryForUserDataInjectable, () => "/some-user-data"); diff --git a/packages/core/src/renderer/components/+custom-resources/__tests__/custom-resource-details.test.tsx b/packages/core/src/renderer/components/+custom-resources/__tests__/custom-resource-details.test.tsx index 2b8e8b2b1e..7da0a91994 100644 --- a/packages/core/src/renderer/components/+custom-resources/__tests__/custom-resource-details.test.tsx +++ b/packages/core/src/renderer/components/+custom-resources/__tests__/custom-resource-details.test.tsx @@ -15,7 +15,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/packages/core/src/renderer/components/+extensions/__tests__/extensions.test.tsx index 751c1a38cc..5e0b668628 100644 --- a/packages/core/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/packages/core/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -39,7 +39,7 @@ describe("Extensions", () => { let downloadBinary: jest.MockedFunction; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads"); diff --git a/packages/core/src/renderer/components/+namespaces/namespace-select-filter.test.tsx b/packages/core/src/renderer/components/+namespaces/namespace-select-filter.test.tsx index 14751c13dd..f646ab0820 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-select-filter.test.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-select-filter.test.tsx @@ -48,7 +48,7 @@ describe("", () => { let cleanup: Disposer; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.unoverride(subscribeStoresInjectable); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); diff --git a/packages/core/src/renderer/components/+namespaces/namespace-store.test.ts b/packages/core/src/renderer/components/+namespaces/namespace-store.test.ts index 81793eec75..e3e33ce9d7 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-store.test.ts +++ b/packages/core/src/renderer/components/+namespaces/namespace-store.test.ts @@ -105,7 +105,7 @@ describe("NamespaceStore", () => { let namespaceStore: NamespaceStore; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx index 783466ffe3..4b63276989 100644 --- a/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx +++ b/packages/core/src/renderer/components/+namespaces/namespace-tree-view.test.tsx @@ -106,7 +106,7 @@ describe("", () => { let render: DiRender; beforeEach(async () => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(hierarchicalNamespacesInjectable, () => [ acmeGroup, diff --git a/packages/core/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx b/packages/core/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx index e25bebc0c2..b99f41808a 100644 --- a/packages/core/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx +++ b/packages/core/src/renderer/components/+network-policies/__tests__/network-policy-details.test.tsx @@ -15,7 +15,7 @@ describe("NetworkPolicyDetails", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx b/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx index 36d0cce310..d9a007bed1 100644 --- a/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx +++ b/packages/core/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx @@ -27,7 +27,7 @@ describe("ClusterRoleBindingDialog tests", () => { let openClusterRoleBindingDialog: OpenClusterRoleBindingDialog; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx b/packages/core/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx index 67d3b38fe1..add1ba98af 100644 --- a/packages/core/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx +++ b/packages/core/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx @@ -24,7 +24,7 @@ describe("RoleBindingDialog tests", () => { let openRoleBindingDialog: OpenRoleBindingDialog; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/+welcome/__test__/welcome.test.tsx b/packages/core/src/renderer/components/+welcome/__test__/welcome.test.tsx index 2b12f5658f..e24df48604 100644 --- a/packages/core/src/renderer/components/+welcome/__test__/welcome.test.tsx +++ b/packages/core/src/renderer/components/+welcome/__test__/welcome.test.tsx @@ -23,7 +23,7 @@ describe("", () => { let welcomeBannersStub: WelcomeBannerRegistration[]; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(currentlyInClusterFrameInjectable, () => false); diff --git a/packages/core/src/renderer/components/+workloads-deployments/scale/dialog.test.tsx b/packages/core/src/renderer/components/+workloads-deployments/scale/dialog.test.tsx index b7f6ba99cb..538e63d3aa 100644 --- a/packages/core/src/renderer/components/+workloads-deployments/scale/dialog.test.tsx +++ b/packages/core/src/renderer/components/+workloads-deployments/scale/dialog.test.tsx @@ -88,7 +88,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(storesAndApisCanBeCreatedInjectable, () => true); diff --git a/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx b/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx index bb85aee1ec..ae177ceada 100644 --- a/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx +++ b/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-container-env.test.tsx @@ -21,7 +21,7 @@ describe("", () => { let configMapStore: jest.Mocked>; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); secretStore = ({ load: jest.fn().mockImplementation(async () => { diff --git a/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx b/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx index 9ddf3080ba..88ceeb9af7 100644 --- a/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx +++ b/packages/core/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx @@ -32,7 +32,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForLensLocalStorageInjectable, () => "some-directory-for-lens-local-storage" ); diff --git a/packages/core/src/renderer/components/+workloads-pods/details/volumes/variants/__tests__/ceph-fs.test.tsx b/packages/core/src/renderer/components/+workloads-pods/details/volumes/variants/__tests__/ceph-fs.test.tsx index 0345050a77..dd87a0826a 100644 --- a/packages/core/src/renderer/components/+workloads-pods/details/volumes/variants/__tests__/ceph-fs.test.tsx +++ b/packages/core/src/renderer/components/+workloads-pods/details/volumes/variants/__tests__/ceph-fs.test.tsx @@ -16,7 +16,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); diff --git a/packages/core/src/renderer/components/+workloads-replicasets/scale-dialog/dialog.test.tsx b/packages/core/src/renderer/components/+workloads-replicasets/scale-dialog/dialog.test.tsx index d1e2aefd66..a82f8e1fb6 100755 --- a/packages/core/src/renderer/components/+workloads-replicasets/scale-dialog/dialog.test.tsx +++ b/packages/core/src/renderer/components/+workloads-replicasets/scale-dialog/dialog.test.tsx @@ -81,7 +81,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(storesAndApisCanBeCreatedInjectable, () => true); diff --git a/packages/core/src/renderer/components/+workloads-statefulsets/scale/dialog.test.tsx b/packages/core/src/renderer/components/+workloads-statefulsets/scale/dialog.test.tsx index 5d09b032e3..8c0f983f6f 100755 --- a/packages/core/src/renderer/components/+workloads-statefulsets/scale/dialog.test.tsx +++ b/packages/core/src/renderer/components/+workloads-statefulsets/scale/dialog.test.tsx @@ -92,7 +92,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(storesAndApisCanBeCreatedInjectable, () => true); diff --git a/packages/core/src/renderer/components/__tests__/cronjob.store.test.ts b/packages/core/src/renderer/components/__tests__/cronjob.store.test.ts index 322e609953..b704d24598 100644 --- a/packages/core/src/renderer/components/__tests__/cronjob.store.test.ts +++ b/packages/core/src/renderer/components/__tests__/cronjob.store.test.ts @@ -121,7 +121,7 @@ describe("CronJob Store tests", () => { let cronJobStore: CronJobStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/__tests__/daemonset.store.test.ts b/packages/core/src/renderer/components/__tests__/daemonset.store.test.ts index da5a167ffd..755c666b85 100644 --- a/packages/core/src/renderer/components/__tests__/daemonset.store.test.ts +++ b/packages/core/src/renderer/components/__tests__/daemonset.store.test.ts @@ -138,7 +138,7 @@ describe("DaemonSet Store tests", () => { let daemonSetStore: DaemonSetStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/__tests__/deployments.store.test.ts b/packages/core/src/renderer/components/__tests__/deployments.store.test.ts index dc50f85ccf..1991c30691 100644 --- a/packages/core/src/renderer/components/__tests__/deployments.store.test.ts +++ b/packages/core/src/renderer/components/__tests__/deployments.store.test.ts @@ -210,7 +210,7 @@ describe("Deployment Store tests", () => { let deploymentStore: DeploymentStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/__tests__/job.store.test.ts b/packages/core/src/renderer/components/__tests__/job.store.test.ts index 5a000d18ae..74a25f2b8f 100644 --- a/packages/core/src/renderer/components/__tests__/job.store.test.ts +++ b/packages/core/src/renderer/components/__tests__/job.store.test.ts @@ -175,7 +175,7 @@ describe("Job Store tests", () => { let jobStore: JobStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/__tests__/pods.store.test.ts b/packages/core/src/renderer/components/__tests__/pods.store.test.ts index 229c94c2d8..e45697eeae 100644 --- a/packages/core/src/renderer/components/__tests__/pods.store.test.ts +++ b/packages/core/src/renderer/components/__tests__/pods.store.test.ts @@ -121,7 +121,7 @@ describe("Pod Store tests", () => { let podStore: PodStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/__tests__/replicaset.store.test.ts b/packages/core/src/renderer/components/__tests__/replicaset.store.test.ts index 3186725981..99c3dd8067 100644 --- a/packages/core/src/renderer/components/__tests__/replicaset.store.test.ts +++ b/packages/core/src/renderer/components/__tests__/replicaset.store.test.ts @@ -138,7 +138,7 @@ describe("ReplicaSet Store tests", () => { let replicaSetStore: ReplicaSetStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/__tests__/statefulset.store.test.ts b/packages/core/src/renderer/components/__tests__/statefulset.store.test.ts index 742955884c..92d8f94aed 100644 --- a/packages/core/src/renderer/components/__tests__/statefulset.store.test.ts +++ b/packages/core/src/renderer/components/__tests__/statefulset.store.test.ts @@ -138,7 +138,7 @@ describe("StatefulSet Store tests", () => { let statefulSetStore: StatefulSetStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/avatar/__tests__/avatar.test.tsx b/packages/core/src/renderer/components/avatar/__tests__/avatar.test.tsx index 82f4591ff9..fe5b44bdad 100644 --- a/packages/core/src/renderer/components/avatar/__tests__/avatar.test.tsx +++ b/packages/core/src/renderer/components/avatar/__tests__/avatar.test.tsx @@ -14,7 +14,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/cluster-settings/__tests__/cluster-local-terminal-settings.test.tsx b/packages/core/src/renderer/components/cluster-settings/__tests__/cluster-local-terminal-settings.test.tsx index f450aa1406..50fba67427 100644 --- a/packages/core/src/renderer/components/cluster-settings/__tests__/cluster-local-terminal-settings.test.tsx +++ b/packages/core/src/renderer/components/cluster-settings/__tests__/cluster-local-terminal-settings.test.tsx @@ -21,7 +21,7 @@ describe("ClusterLocalTerminalSettings", () => { let statMock: jest.Mock; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); showErrorNotificationMock = jest.fn(); diff --git a/packages/core/src/renderer/components/dock/__test__/dock-store.test.ts b/packages/core/src/renderer/components/dock/__test__/dock-store.test.ts index 1fd7e102e8..92a0b735cc 100644 --- a/packages/core/src/renderer/components/dock/__test__/dock-store.test.ts +++ b/packages/core/src/renderer/components/dock/__test__/dock-store.test.ts @@ -22,7 +22,7 @@ describe("DockStore", () => { let dockStore: DockStore; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(hostedClusterIdInjectable, () => "some-cluster-id"); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); diff --git a/packages/core/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx b/packages/core/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx index 8ac373b814..1829167920 100644 --- a/packages/core/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx +++ b/packages/core/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx @@ -107,7 +107,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); const { ensureDirSync } = di.inject(fsInjectable); diff --git a/packages/core/src/renderer/components/dock/logs/__test__/log-search.test.tsx b/packages/core/src/renderer/components/dock/logs/__test__/log-search.test.tsx index bf41bb8252..f8bccd556a 100644 --- a/packages/core/src/renderer/components/dock/logs/__test__/log-search.test.tsx +++ b/packages/core/src/renderer/components/dock/logs/__test__/log-search.test.tsx @@ -63,7 +63,7 @@ describe("LogSearch tests", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx b/packages/core/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx index 9e4177c1dd..2aa43bb13b 100644 --- a/packages/core/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx +++ b/packages/core/src/renderer/components/dock/logs/__test__/to-bottom.test.tsx @@ -15,7 +15,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/drawer/drawer-param-toggler.test.tsx b/packages/core/src/renderer/components/drawer/drawer-param-toggler.test.tsx index 6a319cdd51..3a35a7d76f 100644 --- a/packages/core/src/renderer/components/drawer/drawer-param-toggler.test.tsx +++ b/packages/core/src/renderer/components/drawer/drawer-param-toggler.test.tsx @@ -14,7 +14,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); result = render(( diff --git a/packages/core/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx b/packages/core/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx index a481db2d3b..bb370562f3 100644 --- a/packages/core/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx +++ b/packages/core/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx @@ -30,7 +30,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(storesAndApisCanBeCreatedInjectable, () => true); di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data"); diff --git a/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.test.tsx b/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.test.tsx index 356b3ee34d..fa06a6d2a0 100644 --- a/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.test.tsx +++ b/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.test.tsx @@ -28,7 +28,7 @@ describe("kube-object-list-layout", () => { let podStore: PodStore; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(directoryForUserDataInjectable, () => "/some-user-store-path"); di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); diff --git a/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx b/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx index b435d2b6b6..56841c2136 100644 --- a/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx +++ b/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx @@ -32,7 +32,7 @@ describe("kube-object-menu", () => { let render: DiRender; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); runInAction(() => { di.register( diff --git a/packages/core/src/renderer/components/layout/__tests__/sidebar-cluster.test.tsx b/packages/core/src/renderer/components/layout/__tests__/sidebar-cluster.test.tsx index 831bb1d704..f9d447dd5e 100644 --- a/packages/core/src/renderer/components/layout/__tests__/sidebar-cluster.test.tsx +++ b/packages/core/src/renderer/components/layout/__tests__/sidebar-cluster.test.tsx @@ -34,7 +34,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); di.override(hotbarStoreInjectable, () => ({ isAddedToActive: () => {}, diff --git a/packages/core/src/renderer/components/layout/top-bar/top-bar.test.tsx b/packages/core/src/renderer/components/layout/top-bar/top-bar.test.tsx index 10a1ec11d4..5b77a0eb62 100644 --- a/packages/core/src/renderer/components/layout/top-bar/top-bar.test.tsx +++ b/packages/core/src/renderer/components/layout/top-bar/top-bar.test.tsx @@ -34,7 +34,7 @@ describe("", () => { let toggleMaximizeWindow: jest.MockedFunction<() => void>; beforeEach(() => { - di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting(); di.override(rendererExtensionsInjectable, () => computed(() => [])); di.override(openAppContextMenuInjectable, () => openAppContextMenu = jest.fn()); diff --git a/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts b/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts index 28a8f32016..6a0b82a83d 100644 --- a/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts +++ b/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts @@ -10,7 +10,9 @@ describe("get-editor-height-from-lines-number", () => { let getEditorHeightFromLinesNumber: (linesCount: number) => number; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: false }); + const di = getDiForUnitTesting(); + + di.unoverride(getEditorHeightFromLinesCountInjectable); getEditorHeightFromLinesNumber = di.inject(getEditorHeightFromLinesCountInjectable); }); diff --git a/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx b/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx index e83bee28c0..4e410a18a1 100644 --- a/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx +++ b/packages/core/src/renderer/components/render-delay/__tests__/render-delay.test.tsx @@ -17,7 +17,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); diff --git a/packages/core/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx b/packages/core/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx index 1dc21b6735..10be75ae51 100644 --- a/packages/core/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx +++ b/packages/core/src/renderer/components/scroll-spy/__tests__/scroll-spy.test.tsx @@ -25,7 +25,7 @@ describe("", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); @@ -107,7 +107,7 @@ describe(" dataTree inside ", () => { let render: DiRender; beforeEach(() => { - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + const di = getDiForUnitTesting(); render = renderFor(di); }); diff --git a/packages/core/src/renderer/components/select/select.test.tsx b/packages/core/src/renderer/components/select/select.test.tsx index c53535e184..c3d5a2e402 100644 --- a/packages/core/src/renderer/components/select/select.test.tsx +++ b/packages/core/src/renderer/components/select/select.test.tsx @@ -20,7 +20,7 @@ describe("