mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Rename old directory for behaviours as "features" to better communicate new intent with new directory structure to organize code and tests around features instead of technicalities (#6033)
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi> Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Iku-tursoandJanne Savolainen authored and 
GitHub committed
1 parent
36077a9fea
commit
299922c8a7
107 files changed
No files matched your search
+250
@@ -0,0 +1,250 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
||||
import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
||||
import { lensWindowInjectionToken } from "../../main/start-main-application/lens-window/application-window/lens-window-injection-token";
|
||||
import applicationWindowInjectable from "../../main/start-main-application/lens-window/application-window/application-window.injectable";
|
||||
import createElectronWindowForInjectable from "../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
|
||||
import type { AsyncFnMock } from "@async-fn/jest";
|
||||
import asyncFn from "@async-fn/jest";
|
||||
import type { ElectronWindow, LensWindowConfiguration } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
|
||||
import type { DiContainer } from "@ogre-tools/injectable";
|
||||
import lensResourcesDirInjectable from "../../common/vars/lens-resources-dir.injectable";
|
||||
import focusApplicationInjectable from "../../main/electron-app/features/focus-application.injectable";
|
||||
|
||||
describe("opening application window using tray", () => {
|
||||
describe("given application has started", () => {
|
||||
let applicationBuilder: ApplicationBuilder;
|
||||
let createElectronWindowMock: jest.Mock;
|
||||
let expectWindowsToBeOpen: (windowIds: string[]) => void;
|
||||
let callForSplashWindowHtmlMock: AsyncFnMock<() => Promise<void>>;
|
||||
let callForApplicationWindowHtmlMock: AsyncFnMock<() => Promise<void>>;
|
||||
let focusApplicationMock: jest.Mock;
|
||||
|
||||
beforeEach(async () => {
|
||||
callForSplashWindowHtmlMock = asyncFn();
|
||||
callForApplicationWindowHtmlMock = asyncFn();
|
||||
|
||||
focusApplicationMock = jest.fn();
|
||||
|
||||
applicationBuilder = getApplicationBuilder().beforeApplicationStart(
|
||||
({ mainDi }) => {
|
||||
mainDi.override(focusApplicationInjectable, () => focusApplicationMock);
|
||||
|
||||
mainDi.override(lensResourcesDirInjectable, () => "some-lens-resources-directory");
|
||||
|
||||
const loadFileMock = jest
|
||||
.fn(callForSplashWindowHtmlMock)
|
||||
.mockImplementationOnce(() => Promise.resolve());
|
||||
|
||||
const loadUrlMock = jest
|
||||
.fn(callForApplicationWindowHtmlMock)
|
||||
.mockImplementationOnce(() => Promise.resolve());
|
||||
|
||||
createElectronWindowMock = jest.fn((configuration: LensWindowConfiguration) =>
|
||||
({
|
||||
splash: {
|
||||
send: () => {},
|
||||
close: () => {},
|
||||
show: () => {},
|
||||
loadFile: loadFileMock,
|
||||
loadUrl: () => { throw new Error("Should never come here"); },
|
||||
},
|
||||
|
||||
"only-application-window": {
|
||||
send: () => {},
|
||||
close: () => {},
|
||||
show: () => {},
|
||||
loadFile: () => { throw new Error("Should never come here"); },
|
||||
loadUrl: loadUrlMock,
|
||||
},
|
||||
}[configuration.id] as ElectronWindow));
|
||||
|
||||
mainDi.override(
|
||||
createElectronWindowForInjectable,
|
||||
|
||||
() => createElectronWindowMock,
|
||||
);
|
||||
|
||||
expectWindowsToBeOpen = expectWindowsToBeOpenFor(mainDi);
|
||||
},
|
||||
);
|
||||
|
||||
await applicationBuilder.render();
|
||||
});
|
||||
|
||||
it("only an application window is open", () => {
|
||||
expectWindowsToBeOpen(["only-application-window"]);
|
||||
});
|
||||
|
||||
describe("when an attempt to reopen the already started application is made using tray", () => {
|
||||
beforeEach(() => {
|
||||
applicationBuilder.tray.click("open-app");
|
||||
});
|
||||
|
||||
it("still shows only the application window", () => {
|
||||
expectWindowsToBeOpen(["only-application-window"]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("when the application window is closed", () => {
|
||||
beforeEach(() => {
|
||||
const applicationWindow = applicationBuilder.dis.mainDi.inject(
|
||||
applicationWindowInjectable,
|
||||
);
|
||||
|
||||
applicationWindow.close();
|
||||
});
|
||||
|
||||
it("no windows are open", () => {
|
||||
expectWindowsToBeOpen([]);
|
||||
});
|
||||
|
||||
describe("when an application window is reopened using tray", () => {
|
||||
beforeEach(() => {
|
||||
focusApplicationMock.mockClear();
|
||||
|
||||
callForSplashWindowHtmlMock.mockClear();
|
||||
callForApplicationWindowHtmlMock.mockClear();
|
||||
|
||||
applicationBuilder.tray.click("open-app");
|
||||
});
|
||||
|
||||
it("focuses the application", () => {
|
||||
expect(focusApplicationMock).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("still no windows are open", () => {
|
||||
expectWindowsToBeOpen([]);
|
||||
});
|
||||
|
||||
it("starts loading static HTML of splash window", () => {
|
||||
expect(callForSplashWindowHtmlMock).toHaveBeenCalledWith("/some-absolute-root-directory/some-lens-resources-directory/static/splash.html");
|
||||
});
|
||||
|
||||
describe("when loading of splash window HTML resolves", () => {
|
||||
beforeEach(async () => {
|
||||
await callForSplashWindowHtmlMock.resolve();
|
||||
});
|
||||
|
||||
it("shows just the splash window", () => {
|
||||
expectWindowsToBeOpen(["splash"]);
|
||||
});
|
||||
|
||||
it("starts loading of content for the application window", () => {
|
||||
expect(callForApplicationWindowHtmlMock).toHaveBeenCalledWith("http://localhost:42");
|
||||
});
|
||||
|
||||
describe("given static HTML of application window has not resolved yet, when opening from tray again", () => {
|
||||
beforeEach(() => {
|
||||
callForApplicationWindowHtmlMock.mockClear();
|
||||
callForSplashWindowHtmlMock.mockClear();
|
||||
|
||||
applicationBuilder.tray.click("open-app");
|
||||
});
|
||||
|
||||
it("does not load contents of splash window again", () => {
|
||||
expect(callForSplashWindowHtmlMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not load contents of application window again", () => {
|
||||
expect(callForApplicationWindowHtmlMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("shows just the blank application window to permit developer tool access", () => {
|
||||
expectWindowsToBeOpen(["only-application-window"]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("when static HTML of application window resolves", () => {
|
||||
beforeEach(async () => {
|
||||
await callForApplicationWindowHtmlMock.resolve();
|
||||
});
|
||||
|
||||
it("shows just the application window", () => {
|
||||
expectWindowsToBeOpen(["only-application-window"]);
|
||||
});
|
||||
|
||||
describe("when reopening the application using tray", () => {
|
||||
beforeEach(() => {
|
||||
callForSplashWindowHtmlMock.mockClear();
|
||||
callForApplicationWindowHtmlMock.mockClear();
|
||||
|
||||
applicationBuilder.tray.click("open-app");
|
||||
});
|
||||
|
||||
it("still shows just the application window", () => {
|
||||
expectWindowsToBeOpen(["only-application-window"]);
|
||||
});
|
||||
|
||||
it("does not load HTML for splash window again", () => {
|
||||
expect(callForSplashWindowHtmlMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("does not load HTML for application window again", () => {
|
||||
expect(callForApplicationWindowHtmlMock).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("given opening of splash window has not finished yet, but another attempt to open the application is made", () => {
|
||||
beforeEach(() => {
|
||||
createElectronWindowMock.mockClear();
|
||||
|
||||
applicationBuilder.tray.click("open-app");
|
||||
});
|
||||
|
||||
it("does not open any new windows", () => {
|
||||
expect(createElectronWindowMock).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("when opening of splash window resolves", () => {
|
||||
beforeEach(async () => {
|
||||
await callForSplashWindowHtmlMock.resolve();
|
||||
});
|
||||
|
||||
it("still only splash window is open", () => {
|
||||
expectWindowsToBeOpen(["splash"]);
|
||||
});
|
||||
|
||||
it("when opening of application window finishes, only an application window is open", async () => {
|
||||
await callForApplicationWindowHtmlMock.resolve();
|
||||
|
||||
expectWindowsToBeOpen(["only-application-window"]);
|
||||
});
|
||||
|
||||
describe("given opening of application window has not finished yet, but another attempt to open the application is made", () => {
|
||||
beforeEach(() => {
|
||||
createElectronWindowMock.mockClear();
|
||||
|
||||
applicationBuilder.tray.click("open-app");
|
||||
});
|
||||
|
||||
it("does not open any new windows", () => {
|
||||
expect(createElectronWindowMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("when opening finishes, only an application window is open", async () => {
|
||||
await callForApplicationWindowHtmlMock.resolve();
|
||||
|
||||
expectWindowsToBeOpen(["only-application-window"]);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
const expectWindowsToBeOpenFor = (di: DiContainer) => (windowIds: string[]) => {
|
||||
const windows = di.injectMany(lensWindowInjectionToken);
|
||||
|
||||
expect(
|
||||
windows.filter((window) => window.isVisible).map((window) => window.id),
|
||||
).toEqual(windowIds);
|
||||
};
|
||||
+91
@@ -0,0 +1,91 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
|
||||
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
||||
import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
||||
import type { ClusterManager } from "../../main/cluster-manager";
|
||||
import { lensWindowInjectionToken } from "../../main/start-main-application/lens-window/application-window/lens-window-injection-token";
|
||||
import exitAppInjectable from "../../main/electron-app/features/exit-app.injectable";
|
||||
import clusterManagerInjectable from "../../main/cluster-manager.injectable";
|
||||
import stopServicesAndExitAppInjectable from "../../main/stop-services-and-exit-app.injectable";
|
||||
import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
|
||||
|
||||
describe("quitting the app using application menu", () => {
|
||||
describe("given application has started", () => {
|
||||
let applicationBuilder: ApplicationBuilder;
|
||||
let clusterManagerStub: ClusterManager;
|
||||
let exitAppMock: jest.Mock;
|
||||
|
||||
beforeEach(async () => {
|
||||
useFakeTime("2015-10-21T07:28:00Z");
|
||||
|
||||
applicationBuilder = getApplicationBuilder().beforeApplicationStart(
|
||||
({ mainDi }) => {
|
||||
mainDi.unoverride(stopServicesAndExitAppInjectable);
|
||||
|
||||
clusterManagerStub = { stop: jest.fn() } as unknown as ClusterManager;
|
||||
mainDi.override(clusterManagerInjectable, () => clusterManagerStub);
|
||||
|
||||
exitAppMock = jest.fn();
|
||||
mainDi.override(exitAppInjectable, () => exitAppMock);
|
||||
},
|
||||
);
|
||||
|
||||
await applicationBuilder.render();
|
||||
});
|
||||
|
||||
it("only an application window is open", () => {
|
||||
const windows = applicationBuilder.dis.mainDi.injectMany(
|
||||
lensWindowInjectionToken,
|
||||
);
|
||||
|
||||
expect(
|
||||
windows.map((window) => ({ id: window.id, visible: window.isVisible })),
|
||||
).toEqual([
|
||||
{ id: "only-application-window", visible: true },
|
||||
{ id: "splash", visible: false },
|
||||
]);
|
||||
});
|
||||
|
||||
describe("when application is quit", () => {
|
||||
beforeEach(() => {
|
||||
applicationBuilder.applicationMenu.click("root.quit");
|
||||
});
|
||||
|
||||
it("closes all windows", () => {
|
||||
const windows = applicationBuilder.dis.mainDi.injectMany(
|
||||
lensWindowInjectionToken,
|
||||
);
|
||||
|
||||
expect(
|
||||
windows.map((window) => ({ id: window.id, visible: window.isVisible })),
|
||||
).toEqual([
|
||||
{ id: "only-application-window", visible: false },
|
||||
{ id: "splash", visible: false },
|
||||
]);
|
||||
});
|
||||
|
||||
it("disconnects all clusters", () => {
|
||||
expect(clusterManagerStub.stop).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("after insufficient time passes, does not terminate application yet", () => {
|
||||
advanceFakeTime(999);
|
||||
|
||||
expect(exitAppMock).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe("after sufficient time passes", () => {
|
||||
beforeEach(() => {
|
||||
advanceFakeTime(1000);
|
||||
});
|
||||
|
||||
it("terminates application", () => {
|
||||
expect(exitAppMock).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user