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

Fix rebase conflicts

Browse Source 
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-06-02 18:01:27 +03:00
parent e9af27103b
commit 02023e9c18
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/utils/channel/channel.test.ts
View File

@ -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,

3
src/main/getDiForUnitTesting.ts
View File

@ -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);
};

2
src/main/utils/channel/message-to-channel.test.ts
View File

@ -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,