From 4fd01ef8f4b25d06926a3694f3c8fac122c80e6e Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Tue, 7 Mar 2023 16:52:07 +0200
Subject: [PATCH] Simplify more usages of getDiForUnitTesting

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 .../get-electron-app-path/get-electron-app-path.test.ts     | 2 ++
 .../get-editor-height-from-lines-number.test.ts             | 2 ++
 .../components/test-utils/get-application-builder.tsx       | 6 ++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts b/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts
index 1988f394b5..f6255cdf99 100644
--- a/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts
+++ b/packages/core/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts
@@ -13,6 +13,8 @@ describe("get-electron-app-path", () => {
   beforeEach(() => {
     const di = getDiForUnitTesting();
 
+    di.unoverride(getElectronAppPathInjectable);
+
     const appStub = {
       name: "some-app-name",
 
diff --git a/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts b/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts
index 0d511e31e3..6a0b82a83d 100644
--- a/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts
+++ b/packages/core/src/renderer/components/monaco-editor/get-editor-height-from-lines-number.test.ts
@@ -12,6 +12,8 @@ describe("get-editor-height-from-lines-number", () => {
   beforeEach(() => {
     const di = getDiForUnitTesting();
 
+    di.unoverride(getEditorHeightFromLinesCountInjectable);
+
     getEditorHeightFromLinesNumber = di.inject(getEditorHeightFromLinesCountInjectable);
   });
 
diff --git a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx
index cea6bb8e9a..5a7861ce52 100644
--- a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx
@@ -168,9 +168,7 @@ interface Environment {
 }
 
 export const getApplicationBuilder = () => {
-  const mainDi = getMainDi({
-    doGeneralOverrides: true,
-  });
+  const mainDi = getMainDi();
 
   runInAction(() => {
     registerFeature(
@@ -236,7 +234,7 @@ export const getApplicationBuilder = () => {
   const createElectronWindowFake: CreateElectronWindow = (configuration) => {
     const windowId = configuration.id;
 
-    const windowDi = getRendererDi({ doGeneralOverrides: true });
+    const windowDi = getRendererDi();
 
     overrideForWindow(windowDi, windowId);
     overrideFsWithFakes(windowDi);