1 files changed, 22 insertions, 23 deletions

diff --git a/packages/main/src/controllers/__tests__/initConfig.spec.ts b/packages/main/src/controllers/__tests__/initConfig.spec.ts
index dc00b9d..fdd22c9 100644
--- a/packages/main/src/controllers/__tests__/initConfig.spec.ts
+++ b/packages/main/src/controllers/__tests__/initConfig.spec.ts
@@ -20,16 +20,15 @@
 
 import { jest } from '@jest/globals';
 import { mocked } from 'jest-mock';
-import { getSnapshot } from 'mobx-state-tree';
 import ms from 'ms';
 
 import type ConfigPersistence from '../../infrastructure/ConfigPersistence';
-import { Config, config as configModel } from '../../stores/Config';
+import { sharedStore, SharedStore } from '../../stores/SharedStore';
 import type Disposer from '../../utils/Disposer';
 import { silenceLogger } from '../../utils/log';
 import initConfig from '../initConfig';
 
-let config: Config;
+let store: SharedStore;
 const persistenceService: ConfigPersistence = {
   readConfig: jest.fn(),
   writeConfig: jest.fn(),
@@ -44,7 +43,7 @@ beforeAll(() => {
 });
 
 beforeEach(() => {
-  config = configModel.create();
+  store = sharedStore.create();
 });
 
 describe('when initializing', () => {
@@ -56,7 +55,7 @@ describe('when initializing', () => {
     });
 
     it('should create a new config file', async () => {
-      await initConfig(config, persistenceService);
+      await initConfig(store, persistenceService);
       expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
     });
 
@@ -65,7 +64,7 @@ describe('when initializing', () => {
         new Error('boo'),
       );
       await expect(() =>
-        initConfig(config, persistenceService),
+        initConfig(store, persistenceService),
       ).rejects.toBeInstanceOf(Error);
     });
   });
@@ -76,16 +75,16 @@ describe('when initializing', () => {
         found: true,
         data: {
           // Use a default empty config file to not trigger config rewrite.
-          ...getSnapshot(config),
+          ...store.config,
           themeSource: 'dark',
         },
       });
     });
 
     it('should read the existing config file is there is one', async () => {
-      await initConfig(config, persistenceService);
+      await initConfig(store, persistenceService);
       expect(persistenceService.writeConfig).not.toHaveBeenCalled();
-      expect(config.themeSource).toBe('dark');
+      expect(store.settings.themeSource).toBe('dark');
     });
 
     it('should bail if it cannot set up a watcher', async () => {
@@ -93,7 +92,7 @@ describe('when initializing', () => {
         throw new Error('boo');
       });
       await expect(() =>
-        initConfig(config, persistenceService),
+        initConfig(store, persistenceService),
       ).rejects.toBeInstanceOf(Error);
     });
   });
@@ -108,7 +107,7 @@ describe('when initializing', () => {
         },
       },
     });
-    await initConfig(config, persistenceService);
+    await initConfig(store, persistenceService);
     expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
   });
 
@@ -119,15 +118,15 @@ describe('when initializing', () => {
         themeSource: -1,
       },
     });
-    await initConfig(config, persistenceService);
-    expect(config.themeSource).not.toBe(-1);
+    await initConfig(store, persistenceService);
+    expect(store.settings.themeSource).not.toBe(-1);
     expect(persistenceService.writeConfig).not.toHaveBeenCalled();
   });
 
   it('should bail if it cannot determine whether there is a config file', async () => {
     mocked(persistenceService.readConfig).mockRejectedValue(new Error('boo'));
     await expect(() =>
-      initConfig(config, persistenceService),
+      initConfig(store, persistenceService),
     ).rejects.toBeInstanceOf(Error);
   });
 });
@@ -140,10 +139,10 @@ describe('when it has loaded the config', () => {
   beforeEach(async () => {
     mocked(persistenceService.readConfig).mockResolvedValueOnce({
       found: true,
-      data: getSnapshot(config),
+      data: store.config,
     });
     mocked(persistenceService.watchConfig).mockReturnValueOnce(watcherDisposer);
-    sutDisposer = await initConfig(config, persistenceService, throttleMs);
+    sutDisposer = await initConfig(store, persistenceService, throttleMs);
     [[configChangedCallback]] = mocked(
       persistenceService.watchConfig,
     ).mock.calls;
@@ -152,16 +151,16 @@ describe('when it has loaded the config', () => {
 
   it('should throttle saving changes to the config file', () => {
     mocked(persistenceService.writeConfig).mockResolvedValue();
-    config.setThemeSource('dark');
+    store.settings.setThemeSource('dark');
     jest.advanceTimersByTime(lessThanThrottleMs);
-    config.setThemeSource('light');
+    store.settings.setThemeSource('light');
     jest.advanceTimersByTime(throttleMs);
     expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
   });
 
   it('should handle config writing errors gracefully', () => {
     mocked(persistenceService.writeConfig).mockRejectedValue(new Error('boo'));
-    config.setThemeSource('dark');
+    store.settings.setThemeSource('dark');
     jest.advanceTimersByTime(throttleMs);
     expect(persistenceService.writeConfig).toHaveBeenCalledTimes(1);
   });
@@ -171,14 +170,14 @@ describe('when it has loaded the config', () => {
       found: true,
       data: {
         // Use a default empty config file to not trigger config rewrite.
-        ...getSnapshot(config),
+        ...store.config,
         themeSource: 'dark',
       },
     });
     await configChangedCallback();
     // Do not write back the changes we have just read.
     expect(persistenceService.writeConfig).not.toHaveBeenCalled();
-    expect(config.themeSource).toBe('dark');
+    expect(store.settings.themeSource).toBe('dark');
   });
 
   it('should update the config file if new details are added', async () => {
@@ -203,7 +202,7 @@ describe('when it has loaded the config', () => {
       },
     });
     await configChangedCallback();
-    expect(config.themeSource).not.toBe(-1);
+    expect(store.settings.themeSource).not.toBe(-1);
     expect(persistenceService.writeConfig).not.toHaveBeenCalled();
   });
 
@@ -222,7 +221,7 @@ describe('when it has loaded the config', () => {
     });
 
     it('should not listen to store changes any more', () => {
-      config.setThemeSource('dark');
+      store.settings.setThemeSource('dark');
       jest.advanceTimersByTime(2 * throttleMs);
       expect(persistenceService.writeConfig).not.toHaveBeenCalled();
     });