From f61330611e68b854369afbefbe923236a142d04b Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 26 Jul 2022 08:55:13 -0400 Subject: [PATCH] Remove global shared state to fix unit tests (#5889) --- .../analytics-for-installing-update.test.ts | 2 +- .../downgrading-version-update.test.ts | 2 +- .../selection-of-update-stability.test.ts | 2 +- src/common/__tests__/base-store.test.ts | 10 ++-------- src/common/__tests__/cluster-store.test.ts | 3 +-- src/common/__tests__/hotbar-store.test.ts | 3 +-- src/common/__tests__/user-store.test.ts | 4 +--- .../default-update-channel.injectable.ts | 12 +++++------- src/common/base-store.ts | 2 +- src/common/vars.ts | 2 -- src/common/vars/app-semantic-version.injectable.ts | 14 ++++++++++++++ .../app-version => vars}/app-version.injectable.ts | 2 +- .../extension-discovery.test.ts | 2 ++ .../is-compatible-bundled-extension.injectable.ts | 6 ++++-- .../is-compatible-extension.injectable.ts | 6 ++++-- src/main/__test__/kube-auth-proxy.test.ts | 2 -- .../update-can-be-downgraded.injectable.ts | 2 +- ...emit-current-version-to-analytics.injectable.ts | 2 +- .../__test__/kubeconfig-sync.test.ts | 2 -- src/main/getDiForUnitTesting.ts | 2 +- src/main/protocol-handler/__test__/router.test.ts | 2 -- src/renderer/components/+catalog/catalog.test.tsx | 2 -- .../+extensions/__tests__/extensions.test.tsx | 2 -- .../components/dock/__test__/dock-tabs.test.tsx | 2 -- .../logs/__test__/log-resource-selector.test.tsx | 2 -- .../__tests__/hotbar-remove-command.test.tsx | 2 -- src/renderer/components/select/select.test.tsx | 4 +--- src/renderer/getDiForUnitTesting.tsx | 2 +- 28 files changed, 44 insertions(+), 56 deletions(-) create mode 100644 src/common/vars/app-semantic-version.injectable.ts rename src/common/{get-configuration-file-model/app-version => vars}/app-version.injectable.ts (83%) diff --git a/src/behaviours/application-update/analytics-for-installing-update.test.ts b/src/behaviours/application-update/analytics-for-installing-update.test.ts index e9dccb326e..b72946f80d 100644 --- a/src/behaviours/application-update/analytics-for-installing-update.test.ts +++ b/src/behaviours/application-update/analytics-for-installing-update.test.ts @@ -16,7 +16,7 @@ import processCheckingForUpdatesInjectable from "../../main/application-update/c import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable"; import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable"; import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; import periodicalCheckForUpdatesInjectable from "../../main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable"; import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; diff --git a/src/behaviours/application-update/downgrading-version-update.test.ts b/src/behaviours/application-update/downgrading-version-update.test.ts index 2abefa1ac8..b50d9c940b 100644 --- a/src/behaviours/application-update/downgrading-version-update.test.ts +++ b/src/behaviours/application-update/downgrading-version-update.test.ts @@ -13,7 +13,7 @@ import checkForPlatformUpdatesInjectable from "../../main/application-update/che import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable"; import selectedUpdateChannelInjectable from "../../common/application-update/selected-update-channel/selected-update-channel.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; import { updateChannels } from "../../common/application-update/update-channels"; describe("downgrading version update", () => { diff --git a/src/behaviours/application-update/selection-of-update-stability.test.ts b/src/behaviours/application-update/selection-of-update-stability.test.ts index c934e7fc43..e90d92770f 100644 --- a/src/behaviours/application-update/selection-of-update-stability.test.ts +++ b/src/behaviours/application-update/selection-of-update-stability.test.ts @@ -21,7 +21,7 @@ import type { IComputedValue } from "mobx"; import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable"; import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable"; import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; describe("selection of update stability", () => { let applicationBuilder: ApplicationBuilder; diff --git a/src/common/__tests__/base-store.test.ts b/src/common/__tests__/base-store.test.ts index e7eb952111..e6b1c2d1d2 100644 --- a/src/common/__tests__/base-store.test.ts +++ b/src/common/__tests__/base-store.test.ts @@ -7,14 +7,9 @@ import mockFs from "mock-fs"; import { BaseStore } from "../base-store"; import { action, comparer, makeObservable, observable, toJS } from "mobx"; import { readFileSync } from "fs"; - -import directoryForUserDataInjectable - from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; -import getConfigurationFileModelInjectable - from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable - from "../get-configuration-file-model/app-version/app-version.injectable"; +import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; jest.mock("electron", () => ({ ipcMain: { @@ -86,7 +81,6 @@ describe("BaseStore", () => { mainDi.override(directoryForUserDataInjectable, () => "some-user-data-directory"); mainDi.permitSideEffects(getConfigurationFileModelInjectable); - mainDi.permitSideEffects(appVersionInjectable); TestStore.resetInstance(); diff --git a/src/common/__tests__/cluster-store.test.ts b/src/common/__tests__/cluster-store.test.ts index e03e0aa533..b74659aea0 100644 --- a/src/common/__tests__/cluster-store.test.ts +++ b/src/common/__tests__/cluster-store.test.ts @@ -18,7 +18,7 @@ import { createClusterInjectionToken } from "../cluster/create-cluster-injection import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../vars/app-version.injectable"; import assert from "assert"; import directoryForTempInjectable from "../app-paths/directory-for-temp/directory-for-temp.injectable"; import kubectlBinaryNameInjectable from "../../main/kubectl/binary-name.injectable"; @@ -93,7 +93,6 @@ describe("cluster-store", () => { mainDi.override(normalizedPlatformInjectable, () => "darwin"); mainDi.permitSideEffects(getConfigurationFileModelInjectable); - mainDi.permitSideEffects(appVersionInjectable); mainDi.permitSideEffects(clusterStoreInjectable); mainDi.permitSideEffects(fsInjectable); diff --git a/src/common/__tests__/hotbar-store.test.ts b/src/common/__tests__/hotbar-store.test.ts index cc8a4dc8fa..d847ac76dc 100644 --- a/src/common/__tests__/hotbar-store.test.ts +++ b/src/common/__tests__/hotbar-store.test.ts @@ -8,7 +8,7 @@ import mockFs from "mock-fs"; import type { CatalogEntity, CatalogEntityData, CatalogEntityKindData } from "../catalog"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../vars/app-version.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import hotbarStoreInjectable from "../hotbars/store.injectable"; import type { HotbarStore } from "../hotbars/store"; @@ -113,7 +113,6 @@ describe("HotbarStore", () => { ])); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); di.permitSideEffects(hotbarStoreInjectable); }); diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts index 238fc5bce8..23740c5457 100644 --- a/src/common/__tests__/user-store.test.ts +++ b/src/common/__tests__/user-store.test.ts @@ -34,7 +34,7 @@ import { defaultThemeId } from "../vars"; import writeFileInjectable from "../fs/write-file.injectable"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../vars/app-version.injectable"; console = new Console(stdout, stderr); @@ -50,8 +50,6 @@ describe("user store tests", () => { di.override(writeFileInjectable, () => () => Promise.resolve()); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.permitSideEffects(getConfigurationFileModelInjectable); - - di.permitSideEffects(appVersionInjectable); di.permitSideEffects(userStoreInjectable); di.unoverride(userStoreInjectable); diff --git a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts b/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts index 3d9101b672..90dc22457a 100644 --- a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts +++ b/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts @@ -3,8 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { SemVer } from "semver"; -import appVersionInjectable from "../../get-configuration-file-model/app-version/app-version.injectable"; +import appSemanticVersionInjectable from "../../vars/app-semantic-version.injectable"; import type { UpdateChannelId } from "../update-channels"; import { updateChannels } from "../update-channels"; @@ -12,12 +11,11 @@ const defaultUpdateChannelInjectable = getInjectable({ id: "default-update-channel", instantiate: (di) => { - const appVersion = di.inject(appVersionInjectable); + const appSemanticVersion = di.inject(appSemanticVersionInjectable); + const currentReleaseChannel = appSemanticVersion.prerelease[0]?.toString(); - const currentReleaseChannel = new SemVer(appVersion).prerelease[0]?.toString() as UpdateChannelId; - - if (currentReleaseChannel && updateChannels[currentReleaseChannel]) { - return updateChannels[currentReleaseChannel]; + if (currentReleaseChannel in updateChannels) { + return updateChannels[currentReleaseChannel as UpdateChannelId]; } return updateChannels.latest; diff --git a/src/common/base-store.ts b/src/common/base-store.ts index 9cc4e27b92..1bc2357458 100644 --- a/src/common/base-store.ts +++ b/src/common/base-store.ts @@ -19,7 +19,7 @@ import { kebabCase } from "lodash"; import { getLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import directoryForUserDataInjectable from "./app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "./get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "./get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "./vars/app-version.injectable"; export interface BaseStoreParams extends ConfOptions { syncOptions?: { diff --git a/src/common/vars.ts b/src/common/vars.ts index fb9156725c..be8b472a5d 100644 --- a/src/common/vars.ts +++ b/src/common/vars.ts @@ -5,7 +5,6 @@ // App's common configuration for any process (main, renderer, build pipeline, etc.) import path from "path"; -import { SemVer } from "semver"; import packageInfo from "../../package.json"; import type { ThemeId } from "../renderer/themes/store"; import { lazyInitialized } from "./utils/lazy-initialized"; @@ -139,7 +138,6 @@ export const lensTwitterWeblinkId = "lens-twitter-link"; export const lensBlogWeblinkId = "lens-blog-link"; export const kubernetesDocumentationWeblinkId = "kubernetes-documentation-link"; -export const appSemVer = new SemVer(packageInfo.version); export const docsUrl = "https://docs.k8slens.dev/main" as string; export const sentryDsn = packageInfo.config?.sentryDsn ?? ""; diff --git a/src/common/vars/app-semantic-version.injectable.ts b/src/common/vars/app-semantic-version.injectable.ts new file mode 100644 index 0000000000..ae68ea828d --- /dev/null +++ b/src/common/vars/app-semantic-version.injectable.ts @@ -0,0 +1,14 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { SemVer } from "semver"; +import appVersionInjectable from "./app-version.injectable"; + +const appSemanticVersionInjectable = getInjectable({ + id: "app-semantic-version", + instantiate: (di) => new SemVer(di.inject(appVersionInjectable)), +}); + +export default appSemanticVersionInjectable; diff --git a/src/common/get-configuration-file-model/app-version/app-version.injectable.ts b/src/common/vars/app-version.injectable.ts similarity index 83% rename from src/common/get-configuration-file-model/app-version/app-version.injectable.ts rename to src/common/vars/app-version.injectable.ts index 5fdfd30eba..d7647f8318 100644 --- a/src/common/get-configuration-file-model/app-version/app-version.injectable.ts +++ b/src/common/vars/app-version.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import packageJsonInjectable from "../../vars/package-json.injectable"; +import packageJsonInjectable from "./package-json.injectable"; const appVersionInjectable = getInjectable({ id: "app-version", diff --git a/src/extensions/extension-discovery/extension-discovery.test.ts b/src/extensions/extension-discovery/extension-discovery.test.ts index 0ae51623ad..cfbad4e11c 100644 --- a/src/extensions/extension-discovery/extension-discovery.test.ts +++ b/src/extensions/extension-discovery/extension-discovery.test.ts @@ -19,6 +19,7 @@ import directoryForUserDataInjectable import mockFs from "mock-fs"; import { delay } from "../../renderer/utils"; import { observable, when } from "mobx"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; jest.setTimeout(60_000); @@ -56,6 +57,7 @@ describe("ExtensionDiscovery", () => { di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.override(installExtensionInjectable, () => () => Promise.resolve()); + di.override(appVersionInjectable, () => "5.0.0"); mockFs(); diff --git a/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts b/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts index 046b106da5..7a29daf23c 100644 --- a/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts +++ b/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts @@ -3,12 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { appSemVer } from "../../../common/vars"; +import appSemanticVersionInjectable from "../../../common/vars/app-semantic-version.injectable"; import { isCompatibleBundledExtension } from "./is-compatible-bundled-extension"; const isCompatibleBundledExtensionInjectable = getInjectable({ id: "is-compatible-bundled-extension", - instantiate: () => isCompatibleBundledExtension({ appSemVer }), + instantiate: (di) => isCompatibleBundledExtension({ + appSemVer: di.inject(appSemanticVersionInjectable), + }), }); export default isCompatibleBundledExtensionInjectable; diff --git a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts index 7ca49a41cd..75e2f45d4a 100644 --- a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts +++ b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts @@ -3,12 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { appSemVer } from "../../../common/vars"; +import appSemanticVersionInjectable from "../../../common/vars/app-semantic-version.injectable"; import { isCompatibleExtension } from "./is-compatible-extension"; const isCompatibleExtensionInjectable = getInjectable({ id: "is-compatible-extension", - instantiate: () => isCompatibleExtension({ appSemVer }), + instantiate: (di) => isCompatibleExtension({ + appSemVer: di.inject(appSemanticVersionInjectable), + }), }); export default isCompatibleExtensionInjectable; diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index ffb1892da2..1e66d0d42b 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -54,7 +54,6 @@ import { createClusterInjectionToken } from "../../common/cluster/create-cluster import path from "path"; import spawnInjectable from "../child-process/spawn.injectable"; import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; @@ -112,7 +111,6 @@ describe("kube auth proxy tests", () => { di.override(normalizedPlatformInjectable, () => "darwin"); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); mockFs(mockMinikubeConfig); diff --git a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts index 72ea5c4023..08fd1d933d 100644 --- a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts +++ b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../../common/vars/app-version.injectable"; import { SemVer } from "semver"; const updateCanBeDowngradedInjectable = getInjectable({ diff --git a/src/main/application-update/emit-current-version-to-analytics.injectable.ts b/src/main/application-update/emit-current-version-to-analytics.injectable.ts index fd190ebf72..7ec8d0b3b5 100644 --- a/src/main/application-update/emit-current-version-to-analytics.injectable.ts +++ b/src/main/application-update/emit-current-version-to-analytics.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { afterApplicationIsLoadedInjectionToken } from "../start-main-application/runnable-tokens/after-application-is-loaded-injection-token"; import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable"; import { getCurrentDateTime } from "../../common/utils/date/get-current-date-time"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; const emitCurrentVersionToAnalyticsInjectable = getInjectable({ id: "emit-current-version-to-analytics", diff --git a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts index 72acbb3c03..08ff464bf2 100644 --- a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts +++ b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts @@ -15,7 +15,6 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token"; import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; import clusterManagerInjectable from "../../cluster-manager.injectable"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import directoryForTempInjectable from "../../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; @@ -59,7 +58,6 @@ describe("kubeconfig-sync.source tests", () => { di.unoverride(clusterStoreInjectable); di.permitSideEffects(clusterStoreInjectable); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); computeDiff = computeDiffFor({ directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable), diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 2024f68d27..9c5a3ab741 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -80,7 +80,7 @@ import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-qui import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable"; import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable"; import startKubeConfigSyncInjectable from "./start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable"; -import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../common/vars/app-version.injectable"; import getRandomIdInjectable from "../common/utils/get-random-id.injectable"; import periodicalCheckForUpdatesInjectable from "./application-update/periodical-check-for-updates/periodical-check-for-updates.injectable"; import execFileInjectable from "../common/fs/exec-file.injectable"; diff --git a/src/main/protocol-handler/__test__/router.test.ts b/src/main/protocol-handler/__test__/router.test.ts index 868aaee7dc..a0f26e9764 100644 --- a/src/main/protocol-handler/__test__/router.test.ts +++ b/src/main/protocol-handler/__test__/router.test.ts @@ -14,7 +14,6 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import lensProtocolRouterMainInjectable from "../lens-protocol-router-main/lens-protocol-router-main.injectable"; import extensionsStoreInjectable from "../../../extensions/extensions-store/extensions-store.injectable"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; import { LensExtension } from "../../../extensions/lens-extension"; import type { LensExtensionId } from "../../../extensions/lens-extension"; import type { ObservableMap } from "mobx"; @@ -44,7 +43,6 @@ describe("protocol router tests", () => { } as unknown as ExtensionsStore)); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx index 808226727c..899b97bed2 100644 --- a/src/renderer/components/+catalog/catalog.test.tsx +++ b/src/renderer/components/+catalog/catalog.test.tsx @@ -22,7 +22,6 @@ import { renderFor } from "../test-utils/renderFor"; import mockFs from "mock-fs"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; import type { AppEvent } from "../../../common/app-event-bus/event-bus"; import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable"; import { computed } from "mobx"; @@ -95,7 +94,6 @@ describe("", () => { di.override(broadcastMessageInjectable, () => async () => {}); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); mockFs(); CatalogEntityDetailRegistry.createInstance(); diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index 66f0830c3d..5de9e15f1f 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -21,7 +21,6 @@ import extensionDiscoveryInjectable from "../../../../extensions/extension-disco import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import directoryForDownloadsInjectable from "../../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable"; import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../../common/get-configuration-file-model/app-version/app-version.injectable"; import assert from "assert"; import type { InstallFromInput } from "../install-from-input/install-from-input"; import installFromInputInjectable from "../install-from-input/install-from-input.injectable"; @@ -64,7 +63,6 @@ describe("Extensions", () => { di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads"); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); mockFs({ "some-directory-for-user-data": {}, diff --git a/src/renderer/components/dock/__test__/dock-tabs.test.tsx b/src/renderer/components/dock/__test__/dock-tabs.test.tsx index 8c834061d8..0dbb548be7 100644 --- a/src/renderer/components/dock/__test__/dock-tabs.test.tsx +++ b/src/renderer/components/dock/__test__/dock-tabs.test.tsx @@ -17,7 +17,6 @@ import type { DiRender } from "../../test-utils/renderFor"; import { renderFor } from "../../test-utils/renderFor"; import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../../common/get-configuration-file-model/app-version/app-version.injectable"; import assert from "assert"; import hostedClusterIdInjectable from "../../../cluster-frame-context/hosted-cluster-id.injectable"; @@ -84,7 +83,6 @@ describe("", () => { ); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); dockStore = di.inject(dockStoreInjectable); diff --git a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx index 5fd6161052..744be3fae9 100644 --- a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx @@ -20,7 +20,6 @@ import type { TabId } from "../../dock/store"; import userEvent from "@testing-library/user-event"; import { SearchStore } from "../../../../search-store/search-store"; import getConfigurationFileModelInjectable from "../../../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../../../common/get-configuration-file-model/app-version/app-version.injectable"; import assert from "assert"; jest.mock("electron", () => ({ @@ -133,7 +132,6 @@ describe("", () => { di.override(callForLogsInjectable, () => () => Promise.resolve("some-logs")); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); render = renderFor(di); diff --git a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx index 48ee9e63b4..cc22112380 100644 --- a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx +++ b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx @@ -16,7 +16,6 @@ import { ConfirmDialog } from "../../confirm-dialog"; import mockFs from "mock-fs"; import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../../common/get-configuration-file-model/app-version/app-version.injectable"; import type { HotbarStore } from "../../../../common/hotbars/store"; import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable"; @@ -49,7 +48,6 @@ describe("", () => { di.permitSideEffects(hotbarStoreInjectable); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); render = renderFor(di); }); diff --git a/src/renderer/components/select/select.test.tsx b/src/renderer/components/select/select.test.tsx index d9bd53190a..acbb7e15d2 100644 --- a/src/renderer/components/select/select.test.tsx +++ b/src/renderer/components/select/select.test.tsx @@ -16,7 +16,6 @@ import rendererExtensionsInjectable from "../../../extensions/renderer-extension import { computed } from "mobx"; import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; jest.mock("electron", () => ({ ipcRenderer: { @@ -37,9 +36,8 @@ describe("