Cascade different refactorings to eliminate global shared state from app paths

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

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/main/menu/electron-menu-items.test.ts

@@ -32,8 +32,8 @@ describe("electron-menu-items", () => {
   let electronMenuItems: IComputedValue<MenuRegistration[]>;
   let extensionsStub: ObservableMap<string, LensMainExtension>;
 
-  beforeEach(() => {
-    di = getDiForUnitTesting();
+  beforeEach(async () => {
+    di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     extensionsStub = new ObservableMap();
 
@@ -42,6 +42,8 @@ describe("electron-menu-items", () => {
       () => computed(() => [...extensionsStub.values()]),
     );
 
+    await di.runSetups();
+
     electronMenuItems = di.inject(electronMenuItemsInjectable);
   });