Fix e2e test config (#50)

- Use yarn glsp repo over npx to start commands
  (unpinned npx might resolve an unwanted version)
- Fix startup for browser only

Author: tortmayr

examples/workflow-test/configs/utils.ts

@@ -80,7 +80,12 @@ export function getVsixId(): string {
 
 export function findVsixPath(): string {
     const subCommand = useWebExtension() ? 'web-vsix-path' : 'vsix-path';
-    return execSync(`npx glsp repo -d ${getRepoDir()} vscode ${subCommand}`, { encoding: 'utf-8' }).trim();
+    return execSync(`yarn --silent glsp repo -d ${getRepoDir()} vscode ${subCommand}`, { encoding: 'utf-8' }).trim();
+}
+
+export function getBrowserServerBundlePath(): string {
+    const serverRoot = execSync(`yarn --silent glsp repo -d ${getRepoDir()} server-node pwd`, { encoding: 'utf-8' }).trim();
+    return path.resolve(serverRoot, 'examples', 'workflow-server-bundled-web', 'wf-glsp-server-webworker.js');
 }
 
 function parseRequestedProjects(): ProjectName[] | undefined {

examples/workflow-test/configs/webserver.config.ts

@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import * as path from 'path';
 import { PlaywrightTestConfig } from '@playwright/test';
-import { ProjectName, getPort, getRepoDir, getRepoPath, needsGlspServer } from './utils';
+import * as path from 'path';
+import { ProjectName, getBrowserServerBundlePath, getPort, getRepoDir, getRepoPath, needsGlspServer } from './utils';
 
 type WebServerConfig = Extract<NonNullable<PlaywrightTestConfig['webServer']>, unknown[]>[number];
 
@@ -30,7 +30,7 @@ interface ProjectServerConfig {
 export function buildWebServers(activeProjects: ProjectName[]): PlaywrightTestConfig['webServer'] {
     // Resolved lazily inside the function: top-level evaluation would run at import time,
     // before `dotenv.config()` in playwright.config.ts, so GLSP_REPO_DIR would not be picked up.
-    const repo = `npx glsp repo -d ${getRepoDir()}`;
+    const repo = `yarn --silent glsp repo -d ${getRepoDir()}`;
     const theiaAppDir = path.resolve(getRepoPath('glsp-theia-integration'), 'examples', 'browser-app');
 
     const GLSP_SERVER_COMMANDS: Record<string, string> = {
@@ -42,7 +42,7 @@ export function buildWebServers(activeProjects: ProjectName[]): PlaywrightTestCo
     const standalonePort = getPort('STANDALONE_PORT');
     const standaloneBrowserPort = getPort('STANDALONE_BROWSER_PORT');
     const theiaPort = getPort('THEIA_PORT');
-
+    const browserServerBundle = getBrowserServerBundlePath();
     const configs: Partial<Record<ProjectName, ProjectServerConfig>> = {
         standalone: {
             command: `${repo} client start --external-server --no-open`,
@@ -51,7 +51,7 @@ export function buildWebServers(activeProjects: ProjectName[]): PlaywrightTestCo
             path: '/diagram.html'
         },
         'standalone-browser': {
-            command: `${repo} client start --browser --no-open`,
+            command: `${repo} client start --browser --no-open --external-server ${browserServerBundle}`,
             port: standaloneBrowserPort,
             env: { CLIENT_PORT: String(standaloneBrowserPort) },
             path: '/diagram.html'

examples/workflow-test/package.json

@@ -38,7 +38,7 @@
     "prepare": "playwright install",
     "repo": "yarn glsp repo -d .repositories",
     "repo:clean": "rimraf .repositories",
-    "repo:setup": "npx ts-node scripts/setup.ts",
+    "repo:setup": "ts-node scripts/setup.ts",
     "test": "playwright test",
     "test:standalone": "yarn test --project=standalone",
     "test:standalone-browser": "yarn test --project=standalone-browser",