hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Rename callback in ApplicationBuilder for accuracy

Browse Source 
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-05-05 11:25:24 +03:00
parent 34e504b65b
commit 90e7677f36
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
20 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/behaviours/add-cluster/navigation-using-application-menu.test.ts
View File

@ -17,7 +17,7 @@ describe("add-cluster - navigation using application menu", () => {
let rendered: RenderResult; let rendered: RenderResult;
beforeEach(async () => { beforeEach(async () => {
applicationBuilder = getApplicationBuilder().beforeSetups(({ mainDi }) => { applicationBuilder = getApplicationBuilder().beforeApplicationStart(({ mainDi }) => {
mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); mainDi.override(isAutoUpdateEnabledInjectable, () => () => false);
}); });

2
src/behaviours/cluster/order-of-sidebar-items.test.tsx
View File

@ -19,7 +19,7 @@ describe("cluster - order of sidebar items", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder().setEnvironmentToClusterFrame(); applicationBuilder = getApplicationBuilder().setEnvironmentToClusterFrame();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.register(testSidebarItemsInjectable); rendererDi.register(testSidebarItemsInjectable);
}); });
}); });

4
src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
View File

@ -35,7 +35,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
applicationBuilder.setEnvironmentToClusterFrame(); applicationBuilder.setEnvironmentToClusterFrame();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.override( rendererDi.override(
directoryForLensLocalStorageInjectable, directoryForLensLocalStorageInjectable,
() => "/some-directory-for-lens-local-storage", () => "/some-directory-for-lens-local-storage",
@ -45,7 +45,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
describe("given core registrations", () => { describe("given core registrations", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.register(testRouteInjectable); rendererDi.register(testRouteInjectable);
rendererDi.register(testRouteComponentInjectable); rendererDi.register(testRouteComponentInjectable);
rendererDi.register(testSidebarItemsInjectable); rendererDi.register(testSidebarItemsInjectable);

2
src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
View File

@ -31,7 +31,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
applicationBuilder.setEnvironmentToClusterFrame(); applicationBuilder.setEnvironmentToClusterFrame();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.override( rendererDi.override(
directoryForLensLocalStorageInjectable, directoryForLensLocalStorageInjectable,
() => "/some-directory-for-lens-local-storage", () => "/some-directory-for-lens-local-storage",

2
src/behaviours/cluster/visibility-of-sidebar-items.test.tsx
View File

@ -24,7 +24,7 @@ describe("cluster - visibility of sidebar items", () => {
applicationBuilder.setEnvironmentToClusterFrame(); applicationBuilder.setEnvironmentToClusterFrame();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.register(testRouteInjectable); rendererDi.register(testRouteInjectable);
rendererDi.register(testRouteComponentInjectable); rendererDi.register(testRouteComponentInjectable);
rendererDi.register(testSidebarItemsInjectable); rendererDi.register(testSidebarItemsInjectable);

2
src/behaviours/extensions/navigation-using-application-menu.test.ts
View File

@ -22,7 +22,7 @@ describe("extensions - navigation using application menu", () => {
let focusWindowMock: jest.Mock; let focusWindowMock: jest.Mock;
beforeEach(async () => { beforeEach(async () => {
applicationBuilder = getApplicationBuilder().beforeSetups(({ mainDi, rendererDi }) => { applicationBuilder = getApplicationBuilder().beforeApplicationStart(({ mainDi, rendererDi }) => {
mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); mainDi.override(isAutoUpdateEnabledInjectable, () => () => false);
rendererDi.override(extensionsStoreInjectable, () => ({}) as unknown as ExtensionsStore); rendererDi.override(extensionsStoreInjectable, () => ({}) as unknown as ExtensionsStore);
rendererDi.override(fileSystemProvisionerStoreInjectable, () => ({}) as unknown as FileSystemProvisionerStore); rendererDi.override(fileSystemProvisionerStoreInjectable, () => ({}) as unknown as FileSystemProvisionerStore);

4
src/behaviours/navigating-between-routes.test.tsx
View File

@ -31,7 +31,7 @@ describe("navigating between routes", () => {
describe("given route without path parameters", () => { describe("given route without path parameters", () => {
beforeEach(async () => { beforeEach(async () => {
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.register(testRouteWithoutPathParametersInjectable); rendererDi.register(testRouteWithoutPathParametersInjectable);
rendererDi.register(testRouteWithoutPathParametersComponentInjectable); rendererDi.register(testRouteWithoutPathParametersComponentInjectable);
}); });
@ -102,7 +102,7 @@ describe("navigating between routes", () => {
describe("given route with optional path parameters", () => { describe("given route with optional path parameters", () => {
beforeEach(async () => { beforeEach(async () => {
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.register(routeWithOptionalPathParametersInjectable); rendererDi.register(routeWithOptionalPathParametersInjectable);
rendererDi.register(routeWithOptionalPathParametersComponentInjectable); rendererDi.register(routeWithOptionalPathParametersComponentInjectable);
}); });

6
src/behaviours/preferences/closing-preferences.test.tsx
View File

@ -33,7 +33,7 @@ describe("preferences - closing-preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.register(testPreferencesRouteInjectable); rendererDi.register(testPreferencesRouteInjectable);
rendererDi.register(testPreferencesRouteComponentInjectable); rendererDi.register(testPreferencesRouteComponentInjectable);
rendererDi.register(testFrontPageRouteInjectable); rendererDi.register(testFrontPageRouteInjectable);
@ -66,7 +66,7 @@ describe("preferences - closing-preferences", () => {
let rendererDi: DiContainer; let rendererDi: DiContainer;
beforeEach(async () => { beforeEach(async () => {
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.override(observableHistoryInjectable, () => { rendererDi.override(observableHistoryInjectable, () => {
const historyFake = createMemoryHistory({ const historyFake = createMemoryHistory({
initialEntries: ["/some-test-path"], initialEntries: ["/some-test-path"],
@ -139,7 +139,7 @@ describe("preferences - closing-preferences", () => {
let rendererDi: DiContainer; let rendererDi: DiContainer;
beforeEach(async () => { beforeEach(async () => {
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.override(observableHistoryInjectable, () => { rendererDi.override(observableHistoryInjectable, () => {
const historyFake = createMemoryHistory({ const historyFake = createMemoryHistory({
initialEntries: ["/preferences/app"], initialEntries: ["/preferences/app"],

2
src/behaviours/preferences/navigation-to-application-preferences.test.ts
View File

@ -18,7 +18,7 @@ describe("preferences - navigation to application preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
const userStoreStub = { const userStoreStub = {
extensionRegistryUrl: { customUrl: "some-custom-url" }, extensionRegistryUrl: { customUrl: "some-custom-url" },
} as unknown as UserStore; } as unknown as UserStore;

2
src/behaviours/preferences/navigation-to-editor-preferences.test.ts
View File

@ -16,7 +16,7 @@ describe("preferences - navigation to editor preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
const userStoreStub = { const userStoreStub = {
extensionRegistryUrl: { customUrl: "some-custom-url" }, extensionRegistryUrl: { customUrl: "some-custom-url" },
editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 }, editorConfiguration: { minimap: {}, tabSize: 42, fontSize: 42 },

2
src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx
View File

@ -19,7 +19,7 @@ describe("preferences - navigation to extension specific preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
const userStoreStub = { const userStoreStub = {
extensionRegistryUrl: { customUrl: "some-custom-url" }, extensionRegistryUrl: { customUrl: "some-custom-url" },
} as unknown as UserStore; } as unknown as UserStore;

2
src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts
View File

@ -17,7 +17,7 @@ describe("preferences - navigation to kubernetes preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
const userStoreStub = { const userStoreStub = {
extensionRegistryUrl: { customUrl: "some-custom-url" }, extensionRegistryUrl: { customUrl: "some-custom-url" },
syncKubeconfigEntries: observable.map(), syncKubeconfigEntries: observable.map(),

2
src/behaviours/preferences/navigation-to-proxy-preferences.test.ts
View File

@ -16,7 +16,7 @@ describe("preferences - navigation to proxy preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
const userStoreStub = { const userStoreStub = {
extensionRegistryUrl: { customUrl: "some-custom-url" }, extensionRegistryUrl: { customUrl: "some-custom-url" },
} as unknown as UserStore; } as unknown as UserStore;

6
src/behaviours/preferences/navigation-to-telemetry-preferences.test.tsx
View File

@ -20,7 +20,7 @@ describe("preferences - navigation to telemetry preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
const userStoreStub = { const userStoreStub = {
extensionRegistryUrl: { customUrl: "some-custom-url" }, extensionRegistryUrl: { customUrl: "some-custom-url" },
} as unknown as UserStore; } as unknown as UserStore;
@ -133,7 +133,7 @@ describe("preferences - navigation to telemetry preferences", () => {
let rendered: RenderResult; let rendered: RenderResult;
beforeEach(async () => { beforeEach(async () => {
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.override(sentryDnsUrlInjectable, () => "some-sentry-dns-url"); rendererDi.override(sentryDnsUrlInjectable, () => "some-sentry-dns-url");
}); });
@ -163,7 +163,7 @@ describe("preferences - navigation to telemetry preferences", () => {
let rendered: RenderResult; let rendered: RenderResult;
beforeEach(async () => { beforeEach(async () => {
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
rendererDi.override(sentryDnsUrlInjectable, () => null); rendererDi.override(sentryDnsUrlInjectable, () => null);
}); });

2
src/behaviours/preferences/navigation-to-terminal-preferences.test.ts
View File

@ -18,7 +18,7 @@ describe("preferences - navigation to terminal preferences", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
const userStoreStub = { const userStoreStub = {
extensionRegistryUrl: { customUrl: "some-custom-url" }, extensionRegistryUrl: { customUrl: "some-custom-url" },
syncKubeconfigEntries: observable.map(), syncKubeconfigEntries: observable.map(),

2
src/behaviours/preferences/navigation-using-application-menu.test.ts
View File

@ -18,7 +18,7 @@ describe("preferences - navigation using application menu", () => {
beforeEach(async () => { beforeEach(async () => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
applicationBuilder.beforeSetups(({ rendererDi, mainDi }) => { applicationBuilder.beforeApplicationStart(({ rendererDi, mainDi }) => {
mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); mainDi.override(isAutoUpdateEnabledInjectable, () => () => false);
const userStoreStub = { const userStoreStub = {

2
src/behaviours/welcome/navigation-using-application-menu.test.ts
View File

@ -13,7 +13,7 @@ describe("welcome - navigation using application menu", () => {
let rendered: RenderResult; let rendered: RenderResult;
beforeEach(async () => { beforeEach(async () => {
applicationBuilder = getApplicationBuilder().beforeSetups(({ mainDi }) => { applicationBuilder = getApplicationBuilder().beforeApplicationStart(({ mainDi }) => {
mainDi.override(isAutoUpdateEnabledInjectable, () => () => false); mainDi.override(isAutoUpdateEnabledInjectable, () => () => false);
}); });

4
src/common/app-paths/app-paths.test.ts
View File

@ -43,7 +43,7 @@ describe("app-paths", () => {
userData: "some-irrelevant-user-data", userData: "some-irrelevant-user-data",
}; };
applicationBuilder.beforeSetups(({ mainDi }) => { applicationBuilder.beforeApplicationStart(({ mainDi }) => {
mainDi.override( mainDi.override(
getElectronAppPathInjectable, getElectronAppPathInjectable,
() => () =>
@ -117,7 +117,7 @@ describe("app-paths", () => {
describe("when running integration tests", () => { describe("when running integration tests", () => {
beforeEach(async () => { beforeEach(async () => {
applicationBuilder.beforeSetups(({ mainDi }) => { applicationBuilder.beforeApplicationStart(({ mainDi }) => {
mainDi.override( mainDi.override(
directoryForIntegrationTestingInjectable, directoryForIntegrationTestingInjectable,
() => "some-integration-testing-app-data", () => "some-integration-testing-app-data",

2
src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
View File

@ -102,7 +102,7 @@ describe("<DeleteClusterDialog />", () => {
mockFs(); mockFs();
applicationBuilder.beforeSetups(({ mainDi, rendererDi }) => { applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => {
mainDi.override(createContextHandlerInjectable, () => () => undefined); mainDi.override(createContextHandlerInjectable, () => () => undefined);
rendererDi.override(hotbarStoreInjectable, () => ({})); rendererDi.override(hotbarStoreInjectable, () => ({}));

10
src/renderer/components/test-utils/get-application-builder.tsx
View File

@ -51,7 +51,7 @@ export interface ApplicationBuilder {
setEnvironmentToClusterFrame: () => ApplicationBuilder; setEnvironmentToClusterFrame: () => ApplicationBuilder;
addExtensions: (...extensions: LensRendererExtension[]) => Promise<ApplicationBuilder>; addExtensions: (...extensions: LensRendererExtension[]) => Promise<ApplicationBuilder>;
allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder; allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder;
beforeSetups: (callback: Callback) => ApplicationBuilder; beforeApplicationStart: (callback: Callback) => ApplicationBuilder;
beforeRender: (callback: Callback) => ApplicationBuilder; beforeRender: (callback: Callback) => ApplicationBuilder;
render: () => Promise<RenderResult>; render: () => Promise<RenderResult>;
@ -97,7 +97,7 @@ export const getApplicationBuilder = () => {
rendererDi.override(clusterStoreInjectable, () => clusterStoreStub); rendererDi.override(clusterStoreInjectable, () => clusterStoreStub);
mainDi.override(clusterStoreInjectable, () => clusterStoreStub); mainDi.override(clusterStoreInjectable, () => clusterStoreStub);
const beforeSetupsCallbacks: Callback[] = []; const beforeApplicationStartCallbacks: Callback[] = [];
const beforeRenderCallbacks: Callback[] = []; const beforeRenderCallbacks: Callback[] = [];
const extensionsState = observable.array<LensRendererExtension>(); const extensionsState = observable.array<LensRendererExtension>();
@ -287,8 +287,8 @@ export const getApplicationBuilder = () => {
return builder; return builder;
}, },
beforeSetups(callback: (dis: DiContainers) => void) { beforeApplicationStart(callback: (dis: DiContainers) => void) {
beforeSetupsCallbacks.push(callback); beforeApplicationStartCallbacks.push(callback);
return builder; return builder;
}, },
@ -300,7 +300,7 @@ export const getApplicationBuilder = () => {
}, },
async render() { async render() {
for (const callback of beforeSetupsCallbacks) { for (const callback of beforeApplicationStartCallbacks) {
await callback(dis); await callback(dis);
} }