From 950c23d257ebfd12d2ce3351ba1b79f4151a7b12 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Fri, 6 May 2022 13:49:20 +0300 Subject: [PATCH] Replace duplicated overrides with global Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- ...ion-to-extension-specific-preferences.test.tsx | 2 ++ .../navigation-to-telemetry-preferences.test.tsx | 2 ++ .../navigation-to-terminal-preferences.test.ts | 5 ----- src/renderer/getDiForUnitTesting.tsx | 15 +++++++++++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx b/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx index f44fb9bf20..4648c304e1 100644 --- a/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx +++ b/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx @@ -46,6 +46,7 @@ describe("preferences - navigation to extension specific preferences", () => { describe("when extension with specific preferences is enabled", () => { beforeEach(() => { const getRendererExtensionFake = getRendererExtensionFakeFor(applicationBuilder); + const testExtension = getRendererExtensionFake(extensionStubWithExtensionSpecificPreferenceItems); applicationBuilder.addExtensions(testExtension); @@ -95,6 +96,7 @@ describe("preferences - navigation to extension specific preferences", () => { const extensionStubWithExtensionSpecificPreferenceItems: FakeExtensionData = { id: "some-extension-id", name: "some-extension-name", + appPreferences: [ { title: "Some preference item", diff --git a/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx b/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx index f16c2d809b..f26b094bb0 100644 --- a/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx +++ b/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx @@ -48,6 +48,7 @@ describe("preferences - navigation to telemetry preferences", () => { describe("when extension with telemetry preference items gets enabled", () => { beforeEach(() => { const getRendererExtensionFake = getRendererExtensionFakeFor(applicationBuilder); + const testExtensionWithTelemetryPreferenceItems = getRendererExtensionFake(extensionStubWithTelemetryPreferenceItems); applicationBuilder.addExtensions( @@ -92,6 +93,7 @@ describe("preferences - navigation to telemetry preferences", () => { it("given extensions but no telemetry preference items, does not show link for telemetry preferences", () => { const getRendererExtensionFake = getRendererExtensionFakeFor(applicationBuilder); + const testExtensionWithTelemetryPreferenceItems = getRendererExtensionFake({ id: "some-test-extension-id", name: "some-test-extension-name", diff --git a/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts b/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts index 5d7e1e08fb..73eff39006 100644 --- a/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts @@ -5,17 +5,12 @@ import type { RenderResult } from "@testing-library/react"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import defaultShellInjectable from "../../renderer/components/+preferences/default-shell.injectable"; describe("preferences - navigation to terminal preferences", () => { let applicationBuilder: ApplicationBuilder; beforeEach(() => { applicationBuilder = getApplicationBuilder(); - - applicationBuilder.beforeApplicationStart(({ rendererDi }) => { - rendererDi.override(defaultShellInjectable, () => "some-default-shell"); - }); }); describe("given in preferences, when rendered", () => { diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index 22ac104e88..77cb55c638 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -38,11 +38,12 @@ import { ApiManager } from "../common/k8s-api/api-manager"; import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable"; import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectable"; import apiManagerInjectable from "../common/k8s-api/api-manager/manager.injectable"; -import ipcRendererInjectable - from "./app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable"; +import ipcRendererInjectable from "./app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable"; import type { IpcRenderer } from "electron"; import setupOnApiErrorListenersInjectable from "./api/setup-on-api-errors.injectable"; import { observable } from "mobx"; +import defaultShellInjectable from "./components/+preferences/default-shell.injectable"; +import themeStoreInjectable from "./themes/store.injectable"; export const getDiForUnitTesting = (opts: GetDiForUnitTestingOptions = {}) => { const { @@ -100,6 +101,8 @@ export const getDiForUnitTesting = (opts: GetDiForUnitTestingOptions = {}) => { di.override(setupOnApiErrorListenersInjectable, () => ({ run: () => {} })); + di.override(defaultShellInjectable, () => "some-default-shell"); + di.override( userStoreInjectable, () => @@ -128,6 +131,14 @@ export const getDiForUnitTesting = (opts: GetDiForUnitTestingOptions = {}) => { info: noop, silly: noop, })); + + di.override(themeStoreInjectable, () => ({ + activeTheme: { + type: "some-active-theme-type", + }, + + themeOptions: [], + })); } return di;