8 files changed, 15 insertions, 27 deletions

diff --git a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
index b0db115..20a1f70 100644
--- a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
+++ b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
@@ -28,7 +28,7 @@ import { BrowserWindow, ipcMain, IpcMainEvent } from 'electron';
 import type { IJsonPatch } from 'mobx-state-tree';
 
 import type MainStore from '../../../stores/MainStore';
-import { getLogger } from '../../../utils/log';
+import getLogger from '../../../utils/getLogger';
 import RendererBridge from '../RendererBridge';
 import type { MainWindow, ServiceView } from '../types';
 
diff --git a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
index 3118efc..a9298bd 100644
--- a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
+++ b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
@@ -21,7 +21,7 @@
 import { BrowserView } from 'electron';
 
 import type Service from '../../../stores/Service';
-import { getLogger } from '../../../utils/log';
+import getLogger from '../../../utils/getLogger';
 import type Resources from '../../resources/Resources';
 import type { ServiceView } from '../types';
 
diff --git a/packages/main/src/infrastructure/electron/impl/__tests__/electron.integ.spec.ts b/packages/main/src/infrastructure/electron/impl/__tests__/electron.integ.spec.ts
new file mode 100644
index 0000000..f6bd440
--- /dev/null
+++ b/packages/main/src/infrastructure/electron/impl/__tests__/electron.integ.spec.ts
@@ -0,0 +1,9 @@
+import { BrowserWindow } from 'electron';
+
+import '../ElectronMainWindow';
+
+it('should create a BrowserWindow', async () => {
+  const w = new BrowserWindow();
+  await expect(w.loadURL('https://example.org')).resolves.toBeUndefined();
+  w.close();
+});
diff --git a/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts b/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts
index 7457729..ae10677 100644
--- a/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts
+++ b/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts
@@ -30,7 +30,6 @@ import type {
   WebContents,
 } from 'electron';
 
-import { silenceLogger } from '../../../../utils/log';
 import type Resources from '../../../resources/Resources';
 import hardenSession from '../hardenSession';
 
@@ -90,10 +89,6 @@ const fakeSession = fake<Session>({
   },
 });
 
-beforeAll(() => {
-  silenceLogger();
-});
-
 beforeEach(() => {
   permissionRequestHandler = undefined;
   onBeforeRequest = undefined;
diff --git a/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts b/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts
index 29c0516..f7bad0a 100644
--- a/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts
+++ b/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts
@@ -25,7 +25,6 @@ import { fake } from '@sophie/test-utils';
 import type { Event, HandlerDetails, WebContents } from 'electron';
 import { mocked } from 'jest-mock';
 
-import { silenceLogger } from '../../../../utils/log';
 import type Resources from '../../../resources/Resources';
 import lockWebContentsToFile from '../lockWebContentsToFile';
 
@@ -59,17 +58,13 @@ const fakeWebContents = fake<WebContents>({
     }
     return this as WebContents;
   },
-  loadURL: jest.fn(),
+  loadURL: jest.fn<WebContents['loadURL']>(),
 });
 
 const event: Event = {
   preventDefault: jest.fn(),
 };
 
-beforeAll(() => {
-  silenceLogger();
-});
-
 beforeEach(async () => {
   windowOpenHandler = undefined;
   willNavigate = undefined;
diff --git a/packages/main/src/infrastructure/electron/impl/devTools.ts b/packages/main/src/infrastructure/electron/impl/devTools.ts
index 6db88d1..6b06d8f 100644
--- a/packages/main/src/infrastructure/electron/impl/devTools.ts
+++ b/packages/main/src/infrastructure/electron/impl/devTools.ts
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { app, type BrowserWindow } from 'electron';
+import type { BrowserWindow } from 'electron';
 
 /* eslint-disable
   import/no-extraneous-dependencies,
@@ -29,17 +29,6 @@ import { app, type BrowserWindow } from 'electron';
 */
 
 /**
- * Makes sure we use a separate data dir for development.
- */
-export function ensureDevDataDir(): void {
-  // Use alternative directory when debugging to avoid clobbering the main installation.
-  app.setPath('userData', `${app.getPath('userData')}-dev`);
-  const userData = app.getPath('userData');
-  const mkdirp = require('mkdirp') as typeof import('mkdirp');
-  mkdirp.sync(userData);
-}
-
-/**
  * Enables using source maps for node stack traces.
  */
 export function enableStacktraceSourceMaps(): void {
diff --git a/packages/main/src/infrastructure/electron/impl/hardenSession.ts b/packages/main/src/infrastructure/electron/impl/hardenSession.ts
index 53675a7..fc358a1 100644
--- a/packages/main/src/infrastructure/electron/impl/hardenSession.ts
+++ b/packages/main/src/infrastructure/electron/impl/hardenSession.ts
@@ -22,7 +22,7 @@ import { URL } from 'node:url';
 
 import type { Session } from 'electron';
 
-import { getLogger } from '../../../utils/log';
+import getLogger from '../../../utils/getLogger';
 import type Resources from '../../resources/Resources';
 
 /**
diff --git a/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts b/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts
index 48b1bf0..8d557c4 100644
--- a/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts
+++ b/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts
@@ -20,7 +20,7 @@
 
 import type { WebContents } from 'electron';
 
-import { getLogger } from '../../../utils/log';
+import getLogger from '../../../utils/getLogger';
 import type Resources from '../../resources/Resources';
 
 const log = getLogger('lockWebContentsToFile');