From b78d3d503445e305662e99c6a9e45e83b72f27ad Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Mon, 6 Jun 2022 15:54:31 +0300
Subject: [PATCH] Add missing global overrides

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/common/vars/normalized-platform.injectable.ts | 11 +++++++----
 src/main/getDiForUnitTesting.ts                   |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/common/vars/normalized-platform.injectable.ts b/src/common/vars/normalized-platform.injectable.ts
index 7177678407..cb34f1d2fa 100644
--- a/src/common/vars/normalized-platform.injectable.ts
+++ b/src/common/vars/normalized-platform.injectable.ts
@@ -3,11 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import platformInjectable from "./platform.injectable";
 
 const normalizedPlatformInjectable = getInjectable({
   id: "normalized-platform",
-  instantiate: () => {
-    switch (process.platform) {
+
+  instantiate: (di) => {
+    const platform = di.inject(platformInjectable);
+
+    switch (platform) {
       case "darwin":
         return "darwin";
       case "linux":
@@ -15,10 +19,9 @@ const normalizedPlatformInjectable = getInjectable({
       case "win32":
         return "windows";
       default:
-        throw new Error(`platform=${process.platform} is unsupported`);
+        throw new Error(`platform=${platform} is unsupported`);
     }
   },
-  causesSideEffects: true,
 });
 
 export default normalizedPlatformInjectable;
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index f9c781bef3..e76f0f79bd 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -85,6 +85,7 @@ import appVersionInjectable from "../common/get-configuration-file-model/app-ver
 import getRandomIdInjectable from "../common/utils/get-random-id.injectable";
 import periodicalCheckForUpdatesInjectable from "./application-update/periodical-check-for-updates/periodical-check-for-updates.injectable";
 import execFileInjectable from "../common/fs/exec-file.injectable";
+import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-platform-architecture.injectable";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
   const {
@@ -210,6 +211,7 @@ const overrideOperatingSystem = (di: DiContainer) => {
   di.override(platformInjectable, () => "darwin");
   di.override(getAbsolutePathInjectable, () => getAbsolutePathFake);
   di.override(joinPathsInjectable, () => joinPathsFake);
+  di.override(normalizedPlatformArchitectureInjectable, () => "arm64");
 };
 
 const overrideElectronFeatures = (di: DiContainer) => {