use currentApp path for static files

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen committed 2022-12-09 09:14:03 +02:00
1 parent e2d3f5ad4e
commit c69ad966d8
9 files changed
+39 -19

No files matched your search

@@ -79,7 +79,7 @@ describe("installing update", () => {
it("shows normal tray icon", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconTemplate.png",
"/some-static-files-directory/build/tray/trayIconTemplate.png",
);
});
@@ -97,7 +97,7 @@ describe("installing update", () => {
it("shows tray icon for checking for updates", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconCheckingForUpdatesTemplate.png",
"/some-static-files-directory/build/tray/trayIconCheckingForUpdatesTemplate.png",
);
});
@@ -114,7 +114,7 @@ describe("installing update", () => {
it("shows tray icon for normal", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconTemplate.png",
"/some-static-files-directory/build/tray/trayIconTemplate.png",
);
});
@@ -141,7 +141,7 @@ describe("installing update", () => {
it("still shows tray icon for downloading", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconCheckingForUpdatesTemplate.png",
"/some-static-files-directory/build/tray/trayIconCheckingForUpdatesTemplate.png",
);
});
@@ -160,7 +160,7 @@ describe("installing update", () => {
it("still shows normal tray icon", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconTemplate.png",
"/some-static-files-directory/build/tray/trayIconTemplate.png",
);
});
@@ -180,7 +180,7 @@ describe("installing update", () => {
it("shows tray icon for update being available", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconUpdateAvailableTemplate.png",
"/some-static-files-directory/build/tray/trayIconUpdateAvailableTemplate.png",
);
});
@@ -197,7 +197,7 @@ describe("installing update", () => {
it("shows tray icon for checking for updates", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconCheckingForUpdatesTemplate.png",
"/some-static-files-directory/build/tray/trayIconCheckingForUpdatesTemplate.png",
);
});
@@ -215,7 +215,7 @@ describe("installing update", () => {
it("shows tray icon for update being available", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconUpdateAvailableTemplate.png",
"/some-static-files-directory/build/tray/trayIconUpdateAvailableTemplate.png",
);
});
});
@@ -234,7 +234,7 @@ describe("installing update", () => {
it("shows tray icon for downloading update", () => {
expect(builder.tray.getIconPath()).toBe(
"/some-static-files-directory/icons/trayIconCheckingForUpdatesTemplate.png",
"/some-static-files-directory/build/tray/trayIconCheckingForUpdatesTemplate.png",
);
});
});
@@ -8,12 +8,12 @@ import { getApplicationBuilder } from "../../renderer/components/test-utils/get-
import type { AsyncFnMock } from "@async-fn/jest";
import asyncFn from "@async-fn/jest";
import type { LensWindow } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
import lensResourcesDirInjectable from "../../common/vars/lens-resources-dir.injectable";
import focusApplicationInjectable from "../../main/electron-app/features/focus-application.injectable";
import type { CreateElectronWindow } from "../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
import createElectronWindowInjectable from "../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
import splashWindowInjectable from "../../main/start-main-application/lens-window/splash-window/splash-window.injectable";
import { runInAction } from "mobx";
import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable";
describe("opening application window using tray", () => {
describe("given application has started", () => {
@@ -36,8 +36,8 @@ describe("opening application window using tray", () => {
mainDi.override(focusApplicationInjectable, () => focusApplicationMock);
mainDi.override(
lensResourcesDirInjectable,
() => "/some-lens-resources-directory",
staticFilesDirectoryInjectable,
() => "/some-static-directory",
);
const loadFileMock = jest
@@ -119,7 +119,7 @@ describe("opening application window using tray", () => {
});
it("starts loading static HTML of splash window", () => {
expect(callForSplashWindowHtmlMock).toHaveBeenCalledWith("/some-lens-resources-directory/static/splash.html");
expect(callForSplashWindowHtmlMock).toHaveBeenCalledWith("/some-static-directory/splash.html");
});
describe("when loading of splash window HTML resolves", () => {