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

Add behaviours for opening application window using tray and fix indicative bug about opening involuntary duplicate app windows

Browse Source 
Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-06-01 15:05:29 +03:00
parent 48df510e04
commit 37184455aa
4 changed files with 156 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts Normal file
View File

@ -0,0 +1,151 @@
/**
* 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-for.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 { flushPromises } from "../../common/test-utils/flush-promises";
import type { DiContainer } from "@ogre-tools/injectable";
describe("opening application window using tray", () => {
describe("given application has started", () => {
let applicationBuilder: ApplicationBuilder;
let createElectronWindowMock: AsyncFnMock<
(configuration: LensWindowConfiguration) => ElectronWindow
>;
let expectWindowsToBeOpen: (windowIds: string[]) => void;
let resolveOpeningOfWindow: (windowId: string) => Promise<void>;
beforeEach(async () => {
applicationBuilder = getApplicationBuilder().beforeApplicationStart(
({ mainDi }) => {
createElectronWindowMock = asyncFn();
mainDi.override(
createElectronWindowForInjectable,
() => (configuration) => () =>
createElectronWindowMock(configuration),
);
expectWindowsToBeOpen = expectWindowsToBeOpenFor(mainDi);
resolveOpeningOfWindow = resolveOpeningOfWindowFor(
createElectronWindowMock,
);
},
);
const renderPromise = applicationBuilder.render();
await flushPromises();
await resolveOpeningOfWindow("splash");
await resolveOpeningOfWindow("only-application-window");
await renderPromise;
});
it("only an application window is open", () => {
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(() => {
applicationBuilder.tray.click("open-app");
});
it("still no windows are open", () => {
expectWindowsToBeOpen([]);
});
describe("when opening of splash window resolves", () => {
beforeEach(async () => {
await resolveOpeningOfWindow("splash");
});
it("still only splash window is open", () => {
expectWindowsToBeOpen(["splash"]);
});
it("when opening finishes, only an application window is open", async () => {
await resolveOpeningOfWindow("only-application-window");
expectWindowsToBeOpen(["only-application-window"]);
});
describe("given opening 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 resolveOpeningOfWindow("only-application-window");
expectWindowsToBeOpen(["only-application-window"]);
});
});
});
});
});
});
});
const expectWindowsToBeOpenFor = (di: DiContainer) => (windowIds: string[]) => {
const windows = di.injectMany(lensWindowInjectionToken);
expect(
windows.filter((window) => window.visible).map((window) => window.id),
).toEqual(windowIds);
};
const resolveOpeningOfWindowFor =
(
createElectronWindowMock: AsyncFnMock<
(configuration: LensWindowConfiguration) => ElectronWindow
>,
) =>
async (windowId: string) => {
await createElectronWindowMock.resolveSpecific(
[{ id: windowId }],
{
send: () => {},
close: () => {},
show: () => {},
},
);
};

4
src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
View File

@ -13,7 +13,7 @@ export interface ElectronWindow {
send: (args: SendToViewArgs) => void;
}
interface LensWindowConfiguration {
export interface LensWindowConfiguration {
id: string;
title: string;
defaultHeight: number;
@ -47,6 +47,8 @@ const createLensWindowInjectable = getInjectable({
));
return {
id: configuration.id,
get visible() {
return !!browserWindow;
},

1
src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts
View File

@ -12,6 +12,7 @@ export interface SendToViewArgs {
}
export interface LensWindow {
id: string;
show: () => Promise<void>;
close: () => void;
send: (args: SendToViewArgs) => void;

2
src/main/start-main-application/lens-window/show-application-window.injectable.ts
View File

@ -17,7 +17,7 @@ const showApplicationWindowInjectable = getInjectable({
);
return async () => {
if (applicationWindow.visible) {
if (applicationWindow.visible || splashWindow.visible) {
return;
}