diff --git a/src/behaviours/add-cluster/navigation-using-application-menu.test.ts b/src/behaviours/add-cluster/navigation-using-application-menu.test.ts index 4c945c8d6c..104c3326ec 100644 --- a/src/behaviours/add-cluster/navigation-using-application-menu.test.ts +++ b/src/behaviours/add-cluster/navigation-using-application-menu.test.ts @@ -17,7 +17,7 @@ describe("add-cluster - navigation using application menu", () => { let rendered: RenderResult; beforeEach(async () => { - applicationBuilder = getApplicationBuilder().beforeSetups(({ mainDi }) => { + applicationBuilder = getApplicationBuilder().beforeApplicationStart(({ mainDi }) => { mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); }); diff --git a/src/behaviours/cluster/order-of-sidebar-items.test.tsx b/src/behaviours/cluster/order-of-sidebar-items.test.tsx index 681752a28a..77bf395de7 100644 --- a/src/behaviours/cluster/order-of-sidebar-items.test.tsx +++ b/src/behaviours/cluster/order-of-sidebar-items.test.tsx @@ -19,7 +19,7 @@ describe("cluster - order of sidebar items", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder().setEnvironmentToClusterFrame(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.register(testSidebarItemsInjectable); }); }); diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx index aad53c4fd9..e70580b463 100644 --- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx +++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx @@ -35,7 +35,7 @@ describe("cluster - sidebar and tab navigation for core", () => { applicationBuilder.setEnvironmentToClusterFrame(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.override( directoryForLensLocalStorageInjectable, () => "/some-directory-for-lens-local-storage", @@ -45,7 +45,7 @@ describe("cluster - sidebar and tab navigation for core", () => { describe("given core registrations", () => { beforeEach(() => { - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.register(testRouteInjectable); rendererDi.register(testRouteComponentInjectable); rendererDi.register(testSidebarItemsInjectable); diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx index 273a19840c..81b9761d61 100644 --- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx +++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx @@ -31,7 +31,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => { applicationBuilder.setEnvironmentToClusterFrame(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.override( directoryForLensLocalStorageInjectable, () => "/some-directory-for-lens-local-storage", diff --git a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx index 14f575b493..1f7fe1dacb 100644 --- a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx +++ b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx @@ -24,7 +24,7 @@ describe("cluster - visibility of sidebar items", () => { applicationBuilder.setEnvironmentToClusterFrame(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.register(testRouteInjectable); rendererDi.register(testRouteComponentInjectable); rendererDi.register(testSidebarItemsInjectable); diff --git a/src/behaviours/extensions/navigation-using-application-menu.test.ts b/src/behaviours/extensions/navigation-using-application-menu.test.ts index b11fb417be..647c57ee22 100644 --- a/src/behaviours/extensions/navigation-using-application-menu.test.ts +++ b/src/behaviours/extensions/navigation-using-application-menu.test.ts @@ -22,7 +22,7 @@ describe("extensions - navigation using application menu", () => { let focusWindowMock: jest.Mock; beforeEach(async () => { - applicationBuilder = getApplicationBuilder().beforeSetups(({ mainDi, rendererDi }) => { + applicationBuilder = getApplicationBuilder().beforeApplicationStart(({ mainDi, rendererDi }) => { mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); rendererDi.override(extensionsStoreInjectable, () => ({}) as unknown as ExtensionsStore); rendererDi.override(fileSystemProvisionerStoreInjectable, () => ({}) as unknown as FileSystemProvisionerStore); diff --git a/src/behaviours/navigating-between-routes.test.tsx b/src/behaviours/navigating-between-routes.test.tsx index 4cb55cd290..4def9b383f 100644 --- a/src/behaviours/navigating-between-routes.test.tsx +++ b/src/behaviours/navigating-between-routes.test.tsx @@ -31,7 +31,7 @@ describe("navigating between routes", () => { describe("given route without path parameters", () => { beforeEach(async () => { - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.register(testRouteWithoutPathParametersInjectable); rendererDi.register(testRouteWithoutPathParametersComponentInjectable); }); @@ -102,7 +102,7 @@ describe("navigating between routes", () => { describe("given route with optional path parameters", () => { beforeEach(async () => { - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.register(routeWithOptionalPathParametersInjectable); rendererDi.register(routeWithOptionalPathParametersComponentInjectable); }); diff --git a/src/behaviours/preferences/closing-preferences.test.tsx b/src/behaviours/preferences/closing-preferences.test.tsx index 60ab5719b2..9a590ca8e7 100644 --- a/src/behaviours/preferences/closing-preferences.test.tsx +++ b/src/behaviours/preferences/closing-preferences.test.tsx @@ -33,7 +33,7 @@ describe("preferences - closing-preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.register(testPreferencesRouteInjectable); rendererDi.register(testPreferencesRouteComponentInjectable); rendererDi.register(testFrontPageRouteInjectable); @@ -66,7 +66,7 @@ describe("preferences - closing-preferences", () => { let rendererDi: DiContainer; beforeEach(async () => { - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.override(observableHistoryInjectable, () => { const historyFake = createMemoryHistory({ initialEntries: ["/some-test-path"], @@ -139,7 +139,7 @@ describe("preferences - closing-preferences", () => { let rendererDi: DiContainer; beforeEach(async () => { - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.override(observableHistoryInjectable, () => { const historyFake = createMemoryHistory({ initialEntries: ["/preferences/app"], diff --git a/src/behaviours/preferences/navigation-to-application-preferences.test.ts b/src/behaviours/preferences/navigation-to-application-preferences.test.ts index 67d525cfb3..dd5fd5a21a 100644 --- a/src/behaviours/preferences/navigation-to-application-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-application-preferences.test.ts @@ -18,7 +18,7 @@ describe("preferences - navigation to application preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { const userStoreStub = { extensionRegistryUrl: { customUrl: "some-custom-url" }, } as unknown as UserStore; diff --git a/src/behaviours/preferences/navigation-to-editor-preferences.test.ts b/src/behaviours/preferences/navigation-to-editor-preferences.test.ts index 43824371eb..877caddbdd 100644 --- a/src/behaviours/preferences/navigation-to-editor-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-editor-preferences.test.ts @@ -16,7 +16,7 @@ describe("preferences - navigation to editor preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { const userStoreStub = { extensionRegistryUrl: { customUrl: "some-custom-url" }, editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 }, 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 fcfecdf305..48baf5a0ee 100644 --- a/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx +++ b/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx @@ -19,7 +19,7 @@ describe("preferences - navigation to extension specific preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { const userStoreStub = { extensionRegistryUrl: { customUrl: "some-custom-url" }, } as unknown as UserStore; diff --git a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts index 31693a6883..4901e3792d 100644 --- a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts @@ -17,7 +17,7 @@ describe("preferences - navigation to kubernetes preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { const userStoreStub = { extensionRegistryUrl: { customUrl: "some-custom-url" }, syncKubeconfigEntries: observable.map(), diff --git a/src/behaviours/preferences/navigation-to-proxy-preferences.test.ts b/src/behaviours/preferences/navigation-to-proxy-preferences.test.ts index c0b5dc1f25..bc84c37ead 100644 --- a/src/behaviours/preferences/navigation-to-proxy-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-proxy-preferences.test.ts @@ -16,7 +16,7 @@ describe("preferences - navigation to proxy preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { const userStoreStub = { extensionRegistryUrl: { customUrl: "some-custom-url" }, } as unknown as UserStore; diff --git a/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx b/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx index bd972337c3..80ea08ef59 100644 --- a/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx +++ b/src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx @@ -20,7 +20,7 @@ describe("preferences - navigation to telemetry preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { const userStoreStub = { extensionRegistryUrl: { customUrl: "some-custom-url" }, } as unknown as UserStore; @@ -133,7 +133,7 @@ describe("preferences - navigation to telemetry preferences", () => { let rendered: RenderResult; beforeEach(async () => { - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.override(sentryDnsUrlInjectable, () => "some-sentry-dns-url"); }); @@ -163,7 +163,7 @@ describe("preferences - navigation to telemetry preferences", () => { let rendered: RenderResult; beforeEach(async () => { - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { rendererDi.override(sentryDnsUrlInjectable, () => null); }); diff --git a/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts b/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts index 7b273ca8e6..d5e17d1ff7 100644 --- a/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-terminal-preferences.test.ts @@ -18,7 +18,7 @@ describe("preferences - navigation to terminal preferences", () => { beforeEach(() => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi }) => { const userStoreStub = { extensionRegistryUrl: { customUrl: "some-custom-url" }, syncKubeconfigEntries: observable.map(), diff --git a/src/behaviours/preferences/navigation-using-application-menu.test.ts b/src/behaviours/preferences/navigation-using-application-menu.test.ts index efe5a29884..69baa323df 100644 --- a/src/behaviours/preferences/navigation-using-application-menu.test.ts +++ b/src/behaviours/preferences/navigation-using-application-menu.test.ts @@ -18,7 +18,7 @@ describe("preferences - navigation using application menu", () => { beforeEach(async () => { applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeSetups(({ rendererDi, mainDi }) => { + applicationBuilder.beforeApplicationStart(({ rendererDi, mainDi }) => { mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); const userStoreStub = { diff --git a/src/behaviours/welcome/navigation-using-application-menu.test.ts b/src/behaviours/welcome/navigation-using-application-menu.test.ts index c330275e82..e84e5b391f 100644 --- a/src/behaviours/welcome/navigation-using-application-menu.test.ts +++ b/src/behaviours/welcome/navigation-using-application-menu.test.ts @@ -13,7 +13,7 @@ describe("welcome - navigation using application menu", () => { let rendered: RenderResult; beforeEach(async () => { - applicationBuilder = getApplicationBuilder().beforeSetups(({ mainDi }) => { + applicationBuilder = getApplicationBuilder().beforeApplicationStart(({ mainDi }) => { mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); }); diff --git a/src/common/app-paths/app-paths.test.ts b/src/common/app-paths/app-paths.test.ts index f5f3d5d885..5793295e0e 100644 --- a/src/common/app-paths/app-paths.test.ts +++ b/src/common/app-paths/app-paths.test.ts @@ -43,7 +43,7 @@ describe("app-paths", () => { userData: "some-irrelevant-user-data", }; - applicationBuilder.beforeSetups(({ mainDi }) => { + applicationBuilder.beforeApplicationStart(({ mainDi }) => { mainDi.override( getElectronAppPathInjectable, () => @@ -117,7 +117,7 @@ describe("app-paths", () => { describe("when running integration tests", () => { beforeEach(async () => { - applicationBuilder.beforeSetups(({ mainDi }) => { + applicationBuilder.beforeApplicationStart(({ mainDi }) => { mainDi.override( directoryForIntegrationTestingInjectable, () => "some-integration-testing-app-data", diff --git a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx index 69a5fe0cea..5062ef08b8 100644 --- a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx +++ b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx @@ -102,7 +102,7 @@ describe("", () => { mockFs(); - applicationBuilder.beforeSetups(({ mainDi, rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { mainDi.override(createContextHandlerInjectable, () => () => undefined); rendererDi.override(hotbarStoreInjectable, () => ({})); diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 7056a86e8e..dbdabdbc9b 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -51,7 +51,7 @@ export interface ApplicationBuilder { setEnvironmentToClusterFrame: () => ApplicationBuilder; addExtensions: (...extensions: LensRendererExtension[]) => Promise; allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder; - beforeSetups: (callback: Callback) => ApplicationBuilder; + beforeApplicationStart: (callback: Callback) => ApplicationBuilder; beforeRender: (callback: Callback) => ApplicationBuilder; render: () => Promise; @@ -97,7 +97,7 @@ export const getApplicationBuilder = () => { rendererDi.override(clusterStoreInjectable, () => clusterStoreStub); mainDi.override(clusterStoreInjectable, () => clusterStoreStub); - const beforeSetupsCallbacks: Callback[] = []; + const beforeApplicationStartCallbacks: Callback[] = []; const beforeRenderCallbacks: Callback[] = []; const extensionsState = observable.array(); @@ -287,8 +287,8 @@ export const getApplicationBuilder = () => { return builder; }, - beforeSetups(callback: (dis: DiContainers) => void) { - beforeSetupsCallbacks.push(callback); + beforeApplicationStart(callback: (dis: DiContainers) => void) { + beforeApplicationStartCallbacks.push(callback); return builder; }, @@ -300,7 +300,7 @@ export const getApplicationBuilder = () => { }, async render() { - for (const callback of beforeSetupsCallbacks) { + for (const callback of beforeApplicationStartCallbacks) { await callback(dis); }