Fix: test on Linux, 2nd try

Author: kaisalmen

package.json

@@ -66,8 +66,10 @@
     "release:prepare": "npm run reset:repo && npm ci && npm run build && npm run lint && npm run test:run",
     "reset:chrome": "vite-node ./scripts/clean.ts --relativePath . --recursive --paths .chrome",
     "reset:repo": "git clean -f -d -x --exclude=.chrome",
-    "test": "npm run test:install && vitest --config vitest.config.ts",
-    "test:run": "npm run test:install && vitest --config vitest.config.ts --run",
+    "test": "npm run test:install && npm run test:direct",
+    "test:direct": "vitest --config vitest.config.ts",
+    "test:run": "npm run test:install && npm run test:direct:run",
+    "test:direct:run": "vitest --config vitest.config.ts --run",
     "test:debug": "npm run test:playwright -- --inspect-brk=20222 --browser --no-file-parallelism",
     "test:install": "playwright install --with-deps chromium"
   },

packages/wrapper/test/languageClientWrapper.test.ts

@@ -4,31 +4,38 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { beforeAll, describe, expect, test } from 'vitest';
-import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-editor-wrapper';
+import { LanguageClientWrapper } from 'monaco-editor-wrapper';
 import { initServices } from 'monaco-languageclient/vscode/services';
-import { createDefaultLcUnreachableUrlConfig, createDefaultLcWorkerConfig } from './support/helper.js';
+import { createDefaultLcUnreachableUrlConfig, createDefaultLcWorkerConfig, createUnreachableWorkerConfig } from './support/helper.js';
 
 describe('Test LanguageClientWrapper', () => {
 
+    const worker = new Worker('../workers/langium-server.ts', {
+        type: 'module',
+        name: 'Langium LS'
+    });
+
     beforeAll(async () => {
         await initServices({});
     });
 
-    test('Constructor: no config', async () => {
-        const languageClientConfig = createDefaultLcWorkerConfig();
+    test('Constructor: no config', () => {
+        const languageClientConfig = createDefaultLcWorkerConfig(worker);
         const languageClientWrapper = new LanguageClientWrapper({
             languageClientConfig
         });
-        expect(languageClientWrapper.haveLanguageClient).toBeTruthy();
+        expect(languageClientWrapper.haveLanguageClient()).toBeFalsy();
     });
 
     test('Dispose: direct worker is cleaned up afterwards', async () => {
-        const languageClientConfig = createDefaultLcWorkerConfig();
+        const languageClientConfig = createDefaultLcWorkerConfig(worker);
         const languageClientWrapper = new LanguageClientWrapper({
             languageClientConfig
         });
 
-        expect(languageClientWrapper.getWorker()).toBeFalsy();
+        // setTimeout(async () => {
+        expect(worker).toBeDefined();
+        expect(languageClientWrapper.getWorker()).toBeUndefined();
 
         // WA: language client in fails due to vitest (reason not clear, yet)
         await expect(async () => {
@@ -40,15 +47,16 @@ describe('Test LanguageClientWrapper', () => {
         // dispose & verify
         await languageClientWrapper.disposeLanguageClient(true);
         expect(languageClientWrapper.getWorker()).toBeUndefined();
+        // }, 1000);
     });
 
     test('Start: unreachable url', async () => {
-        const languageClientConfig: LanguageClientConfig = createDefaultLcUnreachableUrlConfig();
+        const languageClientConfig = createDefaultLcUnreachableUrlConfig();
         const languageClientWrapper = new LanguageClientWrapper({
             languageClientConfig
         });
 
-        await expect(languageClientWrapper.start()).rejects.toEqual({
+        await expect(await languageClientWrapper.start()).rejects.toEqual({
             message: 'languageClientWrapper (test-ws-unreachable): Websocket connection failed.',
             error: 'No error was provided.'
         });
@@ -66,20 +74,7 @@ describe('Test LanguageClientWrapper', () => {
     });
 
     test('Start: unreachable worker url', async () => {
-        const languageClientConfig: LanguageClientConfig = {
-            name: 'test-worker-unreachable',
-            clientOptions: {
-                documentSelector: ['javascript']
-            },
-            connection: {
-                options: {
-                    $type: 'WorkerConfig',
-                    url: new URL(`${import.meta.url.split('@fs')[0]}/packages/wrapper/test/worker/langium-server.ts`),
-                    type: 'module'
-                }
-            }
-        };
-
+        const languageClientConfig = createUnreachableWorkerConfig();
         const languageClientWrapper = new LanguageClientWrapper({
             languageClientConfig
         });

packages/wrapper/test/support/helper.ts

@@ -32,7 +32,7 @@ export const createWrapperConfigExtendedApp = (): WrapperConfig => {
     };
 };
 
-export const createDefaultLcWorkerConfig = (): LanguageClientConfig => {
+export const createDefaultLcWorkerConfig = (worker: Worker): LanguageClientConfig => {
     return {
         name: 'test-worker-direct',
         clientOptions: {
@@ -42,10 +42,23 @@ export const createDefaultLcWorkerConfig = (): LanguageClientConfig => {
             options: {
                 $type: 'WorkerDirect',
                 // create a web worker to pass to the wrapper
-                worker: new Worker('./worker/langium-server.ts', {
-                    type: 'module',
-                    name: 'Langium LS'
-                })
+                worker
+            }
+        }
+    };
+};
+
+export const createUnreachableWorkerConfig = (): LanguageClientConfig => {
+    return {
+        name: 'test-worker-unreachable',
+        clientOptions: {
+            documentSelector: ['javascript']
+        },
+        connection: {
+            options: {
+                $type: 'WorkerConfig',
+                url: new URL(`${import.meta.url.split('@fs')[0]}/packages/wrapper/test/worker/langium-server.ts`),
+                type: 'module'
             }
         }
     };
@@ -61,7 +74,7 @@ export const createDefaultLcUnreachableUrlConfig = (): LanguageClientConfig => {
             options: {
                 $type: 'WebSocketUrl',
                 url: 'ws://localhost:12345/Tester'
-            }
+            },
         }
     };
 };

packages/wrapper/test/wrapper.test.ts

@@ -230,7 +230,7 @@ describe('Test MonacoEditorLanguageClientWrapper', () => {
 
         // delay execution to prevent error being thrown from monaco api (internal clean-up)
         setTimeout(async () => {
-            expect(await wrapper.start(htmlContainer)).toBeUndefined();
+            await expect(await wrapper.start(htmlContainer)).toBeUndefined();
         }, 100);
     });
 });

vitest.config.ts

@@ -11,7 +11,7 @@ import definedViteConfig from './vite.config.js';
 
 export const vitestConfig = {
     test: {
-        testTimeout: 20000,
+        testTimeout: 25000,
         browser: {
             enabled: true,
             headless: true,