1 files changed, 28 insertions, 24 deletions

diff --git a/packages/main/src/stores/__tests__/Config.spec.ts b/packages/main/src/stores/__tests__/SharedStore.spec.ts
index 22ccbc7..3ea187c 100644
--- a/packages/main/src/stores/__tests__/Config.spec.ts
+++ b/packages/main/src/stores/__tests__/SharedStore.spec.ts
@@ -18,28 +18,28 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { config, Config, ConfigFileIn } from '../Config';
-import type { PartialProfileSnapshotIn } from '../Profile';
-import type { PartialServiceSnapshotIn } from '../Service';
+import type { ProfileConfig } from '../Profile';
+import type { ServiceConfig } from '../Service';
+import { Config, sharedStore, SharedStore } from '../SharedStore';
 
-const profileProps: PartialProfileSnapshotIn = {
+const profileProps: ProfileConfig = {
   name: 'Test profile',
 };
 
-const serviceProps: PartialServiceSnapshotIn = {
+const serviceProps: ServiceConfig = {
   name: 'Test service',
   url: 'https://example.com',
 };
 
-let sut: Config;
+let sut: SharedStore;
 
 beforeEach(() => {
-  sut = config.create();
+  sut = sharedStore.create();
 });
 
-describe('preprocessConfigFile', () => {
+describe('loadConfig', () => {
   it('should load profiles with an ID', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [
         {
           id: 'someId',
@@ -51,14 +51,14 @@ describe('preprocessConfigFile', () => {
   });
 
   it('should generate an ID for profiles without and ID', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [profileProps],
     });
     expect(sut.profiles[0].id).toBeDefined();
   });
 
   it('should load services with an ID and a profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [
         {
           id: 'someProfileId',
@@ -74,12 +74,12 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBe('someServiceId');
-    expect(sut.services[0].profile).toBe(sut.profiles[0]);
+    expect(sut.services[0].settings.profile).toBe(sut.profiles[0]);
   });
 
   it('should refuse to load a profile without a name', () => {
     expect(() => {
-      sut.loadFromConfigFile({
+      sut.loadConfig({
         profiles: [
           {
             id: 'someProfileId',
@@ -87,13 +87,13 @@ describe('preprocessConfigFile', () => {
             name: undefined,
           },
         ],
-      } as unknown as ConfigFileIn);
+      } as unknown as Config);
     }).toThrow();
     expect(sut.profiles).toHaveLength(0);
   });
 
   it('should load services without an ID but with a profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [
         {
           id: 'someProfileId',
@@ -108,11 +108,11 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBeDefined();
-    expect(sut.services[0].profile).toBe(sut.profiles[0]);
+    expect(sut.services[0].settings.profile).toBe(sut.profiles[0]);
   });
 
   it('should create a profile for a service with an ID but no profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       services: [
         {
           id: 'someServiceId',
@@ -121,12 +121,14 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBe('someServiceId');
-    expect(sut.services[0].profile).toBeDefined();
-    expect(sut.services[0].profile.name).toBe(serviceProps.name);
+    expect(sut.services[0].settings.profile).toBeDefined();
+    expect(sut.services[0].settings.profile.settings.name).toBe(
+      serviceProps.name,
+    );
   });
 
   it('should create a profile for a service without an ID or profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       services: [
         {
           ...serviceProps,
@@ -134,13 +136,15 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBeDefined();
-    expect(sut.services[0].profile).toBeDefined();
-    expect(sut.services[0].profile.name).toBe(serviceProps.name);
+    expect(sut.services[0].settings.profile).toBeDefined();
+    expect(sut.services[0].settings.profile.settings.name).toBe(
+      serviceProps.name,
+    );
   });
 
   it('should refuse to load a service without a name', () => {
     expect(() => {
-      sut.loadFromConfigFile({
+      sut.loadConfig({
         services: [
           {
             id: 'someServiceId',
@@ -148,7 +152,7 @@ describe('preprocessConfigFile', () => {
             name: undefined,
           },
         ],
-      } as unknown as ConfigFileIn);
+      } as unknown as Config);
     }).toThrow();
     expect(sut.profiles).toHaveLength(0);
     expect(sut.services).toHaveLength(0);