diff --git a/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts b/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts new file mode 100644 index 0000000000..f150c7c504 --- /dev/null +++ b/src/features/application-update/main/check-for-platform-updates/check-for-platform-updates.global-override-for-injectable.ts @@ -0,0 +1,8 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import checkForPlatformUpdatesInjectable from "./check-for-platform-updates.injectable"; +import { getGlobalOverrideForFunction } from "../../../../common/test-utils/get-global-override-for-function"; + +export default getGlobalOverrideForFunction(checkForPlatformUpdatesInjectable); diff --git a/src/features/application-update/main/download-platform-update/download-platform-update.global-override-for-injectable.ts b/src/features/application-update/main/download-platform-update/download-platform-update.global-override-for-injectable.ts new file mode 100644 index 0000000000..96ab9ecfd0 --- /dev/null +++ b/src/features/application-update/main/download-platform-update/download-platform-update.global-override-for-injectable.ts @@ -0,0 +1,8 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getGlobalOverrideForFunction } from "../../../../common/test-utils/get-global-override-for-function"; +import downloadPlatformUpdateInjectable from "./download-platform-update.injectable"; + +export default getGlobalOverrideForFunction(downloadPlatformUpdateInjectable); diff --git a/src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.global-override-for-injectable.ts b/src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.global-override-for-injectable.ts new file mode 100644 index 0000000000..ac2e329f1c --- /dev/null +++ b/src/features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.global-override-for-injectable.ts @@ -0,0 +1,13 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable"; +import { getGlobalOverride } from "../../../../common/test-utils/get-global-override"; + +export default getGlobalOverride(periodicalCheckForUpdatesInjectable, () => ({ + start: async () => {}, + stop: async () => {}, + started: false, +})); diff --git a/src/features/application-update/main/publish-is-configured.global-override-for-injectable.ts b/src/features/application-update/main/publish-is-configured.global-override-for-injectable.ts new file mode 100644 index 0000000000..9b2be0835c --- /dev/null +++ b/src/features/application-update/main/publish-is-configured.global-override-for-injectable.ts @@ -0,0 +1,8 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getGlobalOverride } from "../../../common/test-utils/get-global-override"; +import publishIsConfiguredInjectable from "./publish-is-configured.injectable"; + +export default getGlobalOverride(publishIsConfiguredInjectable, () => false); diff --git a/src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts b/src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts new file mode 100644 index 0000000000..0ddd46f64d --- /dev/null +++ b/src/features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.global-override-for-injectable.ts @@ -0,0 +1,17 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { computed } from "mobx"; +import { getGlobalOverride } from "../../../../common/test-utils/get-global-override"; +import forceUpdateModalRootFrameComponentInjectable from "./force-update-modal-root-frame-component.injectable"; + +export default getGlobalOverride( + forceUpdateModalRootFrameComponentInjectable, + + () => ({ + id: "force-update-modal", + Component: () => null, + shouldRender: computed(() => false), + }), +); diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index ca67b65fad..8efbe83820 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -59,15 +59,11 @@ import syncThemeFromOperatingSystemInjectable from "./electron-app/features/sync import platformInjectable from "../common/vars/platform.injectable"; import electronQuitAndInstallUpdateInjectable from "./electron-app/features/electron-quit-and-install-update.injectable"; import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable"; -import publishIsConfiguredInjectable from "../features/application-update/main/publish-is-configured.injectable"; -import checkForPlatformUpdatesInjectable from "../features/application-update/main/check-for-platform-updates/check-for-platform-updates.injectable"; import baseBundledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable"; import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable"; -import downloadPlatformUpdateInjectable from "../features/application-update/main/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 getRandomIdInjectable from "../common/utils/get-random-id.injectable"; -import periodicalCheckForUpdatesInjectable from "../features/application-update/main/periodical-check-for-updates/periodical-check-for-updates.injectable"; import execFileInjectable from "../common/fs/exec-file.injectable"; import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-platform-architecture.injectable"; import getHelmChartVersionsInjectable from "./helm/helm-service/get-helm-chart-versions.injectable"; @@ -154,8 +150,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) di.override(applicationMenuInjectable, () => ({ start: () => {}, stop: () => {} })); - di.override(periodicalCheckForUpdatesInjectable, () => ({ start: () => {}, stop: () => {}, started: false })); - overrideFunctionalInjectables(di, [ getHelmChartVersionsInjectable, getHelmChartValuesInjectable, @@ -252,20 +246,14 @@ const overrideElectronFeatures = (di: DiContainer) => { di.override(syncThemeFromOperatingSystemInjectable, () => ({ start: () => {}, stop: () => {} })); di.override(electronQuitAndInstallUpdateInjectable, () => () => {}); di.override(setUpdateOnQuitInjectable, () => () => {}); - di.override(downloadPlatformUpdateInjectable, () => async () => ({ downloadWasSuccessful: true })); di.override(focusApplicationInjectable, () => () => {}); - di.override(checkForPlatformUpdatesInjectable, () => () => { - throw new Error("Tried to check for platform updates without explicit override."); - }); - di.override( getElectronAppPathInjectable, () => (name: string) => `/some-electron-app-path-for-${kebabCase(name)}`, ); di.override(setElectronAppPathInjectable, () => () => {}); - di.override(publishIsConfiguredInjectable, () => false); di.override(electronUpdaterIsActiveInjectable, () => false); }; diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index 5d19662778..1efcb55d44 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -55,7 +55,6 @@ import portForwardDialogClusterFrameChildComponentInjectable from "./port-forwar import setupSystemCaInjectable from "./frames/root-frame/setup-system-ca.injectable"; import extensionShouldBeEnabledForClusterFrameInjectable from "./extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; import { asyncComputed } from "@ogre-tools/injectable-react"; -import forceUpdateModalRootFrameComponentInjectable from "../features/application-update/renderer/force-update-modal/force-update-modal-root-frame-component.injectable"; import legacyOnChannelListenInjectable from "./ipc/legacy-channel-listen.injectable"; import getEntitySettingCommandsInjectable from "./components/command-palette/registered-commands/get-entity-setting-commands.injectable"; import storageSaveDelayInjectable from "./utils/create-storage/storage-save-delay.injectable"; @@ -124,12 +123,6 @@ export const getDiForUnitTesting = ( // TODO: remove when entity settings registry is refactored di.override(getEntitySettingCommandsInjectable, () => () => []); - di.override(forceUpdateModalRootFrameComponentInjectable, () => ({ - id: "force-update-modal", - Component: () => null, - shouldRender: computed(() => false), - })); - // TODO: Remove after "LensRendererExtension.isEnabledForCluster" is removed di.override(extensionShouldBeEnabledForClusterFrameInjectable, () => asyncComputed(async () => true, true),