(fix) config loader tests

Author: dummdidumm

packages/language-server/test/lib/documents/configLoader.test.ts

@@ -14,13 +14,17 @@ describe('ConfigLoader', () => {
         };
     }
 
+    function normalizePath(filePath: string): string {
+        return path.join(...filePath.split('/'));
+    }
+
     async function assertFindsConfig(
         configLoader: ConfigLoader,
         filePath: string,
         configPath: string
     ) {
-        filePath = path.join(...filePath.split('/'));
-        configPath = path.join(...configPath.split('/'));
+        filePath = normalizePath(filePath);
+        configPath = normalizePath(configPath);
         assert.deepStrictEqual(configLoader.getConfig(filePath), configFrom(configPath));
         assert.deepStrictEqual(await configLoader.awaitConfig(filePath), configFrom(configPath));
     }
@@ -32,20 +36,24 @@ describe('ConfigLoader', () => {
             path,
             (module: URL) => Promise.resolve({ default: { preprocess: module.toString() } })
         );
-        await configLoader.loadConfigs('/some/path');
+        await configLoader.loadConfigs(normalizePath('/some/path'));
 
-        assertFindsConfig(configLoader, '/some/path/comp.svelte', '/some/path/svelte.config.js');
-        assertFindsConfig(
+        await assertFindsConfig(
+            configLoader,
+            '/some/path/comp.svelte',
+            '/some/path/svelte.config.js'
+        );
+        await assertFindsConfig(
             configLoader,
             '/some/path/aside/comp.svelte',
             '/some/path/svelte.config.js'
         );
-        assertFindsConfig(
+        await assertFindsConfig(
             configLoader,
             '/some/path/below/comp.svelte',
             '/some/path/below/svelte.config.js'
         );
-        assertFindsConfig(
+        await assertFindsConfig(
             configLoader,
             '/some/path/below/further/comp.svelte',
             '/some/path/below/svelte.config.js'
@@ -62,9 +70,9 @@ describe('ConfigLoader', () => {
             path,
             (module: URL) => Promise.resolve({ default: { preprocess: module.toString() } })
         );
-        await configLoader.loadConfigs('/some/path');
+        await configLoader.loadConfigs(normalizePath('/some/path'));
 
-        assertFindsConfig(configLoader, '/some/path/comp.svelte', '/some/svelte.config.js');
+        await assertFindsConfig(configLoader, '/some/path/comp.svelte', '/some/svelte.config.js');
     });
 
     it('adds fallback if no config found', async () => {
@@ -74,12 +82,14 @@ describe('ConfigLoader', () => {
             path,
             (module: URL) => Promise.resolve({ default: { preprocess: module.toString() } })
         );
-        await configLoader.loadConfigs('/some/path');
+        await configLoader.loadConfigs(normalizePath('/some/path'));
 
         assert.deepStrictEqual(
             // Can't do the equal-check directly, instead check if it's the expected object props
             // of svelte-preprocess
-            Object.keys(configLoader.getConfig('/some/path/comp.svelte')?.preprocess || {}).sort(),
+            Object.keys(
+                configLoader.getConfig(normalizePath('/some/path/comp.svelte'))?.preprocess || {}
+            ).sort(),
             ['defaultLanguages', 'markup', 'script', 'style'].sort()
         );
     });
@@ -110,13 +120,17 @@ describe('ConfigLoader', () => {
             }
         );
         await Promise.all([
-            configLoader.loadConfigs('/some/path'),
-            configLoader.loadConfigs('/some/path/sub'),
-            configLoader.awaitConfig('/some/path/file.svelte')
+            configLoader.loadConfigs(normalizePath('/some/path')),
+            configLoader.loadConfigs(normalizePath('/some/path/sub')),
+            configLoader.awaitConfig(normalizePath('/some/path/file.svelte'))
         ]);
 
-        assertFindsConfig(configLoader, '/some/path/comp.svelte', '/some/path/svelte.config.js');
-        assertFindsConfig(
+        await assertFindsConfig(
+            configLoader,
+            '/some/path/comp.svelte',
+            '/some/path/svelte.config.js'
+        );
+        await assertFindsConfig(
             configLoader,
             '/some/path/sub/comp.svelte',
             '/some/path/svelte.config.js'
@@ -131,7 +145,10 @@ describe('ConfigLoader', () => {
             path,
             () => Promise.resolve('unimportant')
         );
-        assert.deepStrictEqual(configLoader.getConfig('/some/file.svelte'), undefined);
+        assert.deepStrictEqual(
+            configLoader.getConfig(normalizePath('/some/file.svelte')),
+            undefined
+        );
     });
 
     it('should await config', async () => {
@@ -142,8 +159,8 @@ describe('ConfigLoader', () => {
             (module: URL) => Promise.resolve({ default: { preprocess: module.toString() } })
         );
         assert.deepStrictEqual(
-            await configLoader.awaitConfig(path.join('some', 'file.svelte')),
-            configFrom(path.join('some', 'svelte.config.js'))
+            await configLoader.awaitConfig(normalizePath('some/file.svelte')),
+            configFrom(normalizePath('some/svelte.config.js'))
         );
     });
 });