From 02023e9c1844ef80278a2c10578040fa198188cf Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 2 Jun 2022 18:01:27 +0300 Subject: [PATCH] Fix rebase conflicts Signed-off-by: Janne Savolainen --- src/common/utils/channel/channel.test.ts | 2 +- src/main/getDiForUnitTesting.ts | 3 --- src/main/utils/channel/message-to-channel.test.ts | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common/utils/channel/channel.test.ts b/src/common/utils/channel/channel.test.ts index d8574dfc4c..f2748104d7 100644 --- a/src/common/utils/channel/channel.test.ts +++ b/src/common/utils/channel/channel.test.ts @@ -257,7 +257,7 @@ const createTestWindow = (di: DiContainer, id: string) => { title: "Some test window", defaultHeight: 42, defaultWidth: 42, - getContentUrl: () => "some-content-url", + getContentSource: () => ({ url: "some-content-url" }), resizable: true, windowFrameUtilitiesAreShown: false, centered: false, diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 543ba91e60..2cc78ec528 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -34,7 +34,6 @@ import type { AppEvent } from "../common/app-event-bus/event-bus"; import commandLineArgumentsInjectable from "./utils/command-line-arguments.injectable"; import initializeExtensionsInjectable from "./start-main-application/runnables/initialize-extensions.injectable"; import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable"; -import registerFileProtocolInjectable from "./electron-app/features/register-file-protocol.injectable"; import environmentVariablesInjectable from "../common/utils/environment-variables.injectable"; import setupIpcMainHandlersInjectable from "./electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable"; import setupLensProxyInjectable from "./start-main-application/runnables/setup-lens-proxy.injectable"; @@ -255,8 +254,6 @@ const overrideElectronFeatures = (di: DiContainer) => { ); di.override(setElectronAppPathInjectable, () => () => {}); - di.override(registerFileProtocolInjectable, () => () => {}); - di.override(publishIsConfiguredInjectable, () => false); di.override(electronUpdaterIsActiveInjectable, () => false); }; diff --git a/src/main/utils/channel/message-to-channel.test.ts b/src/main/utils/channel/message-to-channel.test.ts index 5871f8107c..cf2fc46549 100644 --- a/src/main/utils/channel/message-to-channel.test.ts +++ b/src/main/utils/channel/message-to-channel.test.ts @@ -151,7 +151,7 @@ const createTestWindow = (di: DiContainer, id: string) => { title: "Some test window", defaultHeight: 42, defaultWidth: 42, - getContentUrl: () => "some-content-url", + getContentSource: () => ({ url: "some-content-url" }), resizable: true, windowFrameUtilitiesAreShown: false, centered: false,