cabloy 5.1.204 → 5.1.205

package/repo-e2e/scripts/managedTestImports.ts

@@ -0,0 +1,110 @@
+import { readdir, readFile } from 'node:fs/promises';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import ts from 'typescript';
+
+const fixturePath = fileURLToPath(new URL('./managedTest.ts', import.meta.url));
+const specRoot = fileURLToPath(new URL('../specs', import.meta.url));
+
+export function managedTestImportViolations(source: string, filename: string): string[] {
+  const file = ts.createSourceFile(
+    filename,
+    source,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.TS,
+  );
+  const errors: string[] = [];
+  let usesManagedTest = false;
+  const isPlaywright = (value: string) =>
+    /^(?:@playwright\/test|playwright(?:-core)?)(?:\/|$)/.test(value);
+  const isFixture = (value: string) =>
+    value.startsWith('.') &&
+    resolve(dirname(filename), value.replace(/\.js$/, '.ts')) === fixturePath;
+  function visit(node: ts.Node) {
+    if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier)) {
+      const module = node.moduleSpecifier.text;
+      const clause = node.importClause;
+      const bindings = clause?.namedBindings;
+      const typeOnly =
+        clause?.isTypeOnly ||
+        (!clause?.name &&
+          bindings &&
+          ts.isNamedImports(bindings) &&
+          bindings.elements.every(item => item.isTypeOnly));
+      if (isPlaywright(module) && !typeOnly)
+        errors.push('runtime Playwright import bypasses managedTest');
+      if (
+        isFixture(module) &&
+        !clause?.isTypeOnly &&
+        bindings &&
+        ts.isNamedImports(bindings) &&
+        bindings.elements.some(
+          item => !item.isTypeOnly && (item.propertyName ?? item.name).text === 'test',
+        )
+      ) {
+        usesManagedTest = true;
+      }
+    }
+    if (
+      ts.isExportDeclaration(node) &&
+      node.moduleSpecifier &&
+      ts.isStringLiteral(node.moduleSpecifier) &&
+      isPlaywright(node.moduleSpecifier.text)
+    ) {
+      const typeOnly =
+        node.isTypeOnly ||
+        (node.exportClause &&
+          ts.isNamedExports(node.exportClause) &&
+          node.exportClause.elements.every(item => item.isTypeOnly));
+      if (!typeOnly) errors.push('runtime Playwright export bypasses managedTest');
+    }
+    if (
+      ts.isCallExpression(node) &&
+      (node.expression.kind === ts.SyntaxKind.ImportKeyword ||
+        (ts.isIdentifier(node.expression) && node.expression.text === 'require'))
+    ) {
+      const module = node.arguments[0];
+      if (module && ts.isStringLiteral(module) && isPlaywright(module.text))
+        errors.push('dynamic Playwright load bypasses managedTest');
+    }
+    if (
+      ts.isImportEqualsDeclaration(node) &&
+      !node.isTypeOnly &&
+      ts.isExternalModuleReference(node.moduleReference)
+    ) {
+      const module = node.moduleReference.expression;
+      if (module && ts.isStringLiteral(module) && isPlaywright(module.text))
+        errors.push('runtime Playwright import assignment bypasses managedTest');
+    }
+    ts.forEachChild(node, visit);
+  }
+  visit(file);
+  if (!usesManagedTest) errors.push('application spec must import test from managedTest');
+  return errors;
+}
+
+async function applicationSpecs(root: string): Promise<string[]> {
+  const entries = await readdir(root, { withFileTypes: true });
+  const files = await Promise.all(
+    entries.map(async entry => {
+      const path = resolve(root, entry.name);
+      if (entry.isSymbolicLink()) throw new Error('Managed E2E spec tree cannot contain symlinks');
+      if (entry.isDirectory()) return applicationSpecs(path);
+      return entry.isFile() && entry.name.endsWith('.spec.ts') ? [path] : [];
+    }),
+  );
+  return files.flat().sort();
+}
+
+/** Check every application spec before Playwright can launch a worker/browser. */
+export async function assertManagedTestImports(root = specRoot): Promise<void> {
+  const specs = await applicationSpecs(root);
+  if (specs.length === 0)
+    throw new Error('Managed E2E application spec discovery returned no specs');
+  for (const spec of specs) {
+    const errors = managedTestImportViolations(await readFile(spec, 'utf8'), spec);
+    if (errors.length)
+      throw new Error(`Managed E2E fixture import violation in ${spec}: ${errors.join('; ')}`);
+  }
+}

package/repo-e2e/scripts/runE2e.ts

@@ -9,6 +9,7 @@ import {
   E2E_ROOT_DIR,
   E2E_SPECS_DIR,
 } from './e2e.ts';
+import { assertManagedTestImports } from './managedTestImports.ts';
 import { combineGreps, parseE2eArgs } from './runE2eArgs.ts';
 
 function run(command: string, args: string[]): void {
@@ -34,7 +35,17 @@ async function assertPortAvailable(): Promise<void> {
 }
 
 const parsed = parseE2eArgs(process.argv.slice(2), E2E_SPECS_DIR);
-await assertPortAvailable();
+if (
+  process.env.VONA_TEST_RUN_ID &&
+  process.env.APP_NAME !== `cabtest${process.env.VONA_TEST_RUN_ID}`
+) {
+  throw new Error('Managed E2E test identity does not match its run ID');
+}
+if (process.env.VONA_TEST_RUN_ID) {
+  await assertManagedTestImports();
+} else {
+  await assertPortAvailable();
+}
 
 const playwrightCommand = resolve(
   E2E_ROOT_DIR,

package/repo-e2e/scripts/startE2eVona.ts

@@ -5,6 +5,10 @@ import { resolve } from 'node:path';
 
 import { E2E_LOCAL_BASE_URL, E2E_ROOT_DIR } from './e2e.ts';
 
+// Root isolated E2E owns the server directly. This wrapper remains for direct, legacy E2E.
+if (process.env.VONA_TEST_RUN_ID) {
+  throw new Error('Root isolated E2E starts its server through the root runner');
+}
 const child: ChildProcess = spawn(
   process.execPath,
   [
@@ -32,11 +36,39 @@ let stopping = false;
 let forced = false;
 let shutdownTimer: NodeJS.Timeout | undefined;
 
-function finish(code: number) {
+async function waitForGroupExit(timeoutMs: number): Promise<boolean> {
+  if (!child.pid || process.platform === 'win32') return true;
+  const deadline = Date.now() + timeoutMs;
+  while (true) {
+    try {
+      process.kill(-child.pid, 0);
+    } catch (error: any) {
+      if (error.code === 'ESRCH') return true;
+      throw error;
+    }
+    if (Date.now() >= deadline) return false;
+    await new Promise(resolve => setTimeout(resolve, 100));
+  }
+}
+
+let finishing = false;
+async function finish(code: number) {
+  if (finishing) return;
+  finishing = true;
   if (shutdownTimer) {
     clearTimeout(shutdownTimer);
     shutdownTimer = undefined;
   }
+  if (child.pid && process.platform !== 'win32' && !(await waitForGroupExit(1000))) {
+    signalChild('SIGINT');
+    if (!(await waitForGroupExit(3500))) {
+      signalChild('SIGKILL');
+      if (!(await waitForGroupExit(1000))) {
+        console.error(`E2E Vona process group is still active: ${child.pid}`);
+        process.exit(1);
+      }
+    }
+  }
   process.exit(code);
 }
 
@@ -64,7 +96,7 @@ function forceStop() {
     `E2E Vona process group did not stop within ${gracefulShutdownTimeout}ms; forcing termination: ${child.pid}`,
   );
   signalChild('SIGKILL');
-  finish(1);
+  void finish(1);
 }
 
 function stop() {
@@ -85,10 +117,10 @@ process.on('SIGTERM', stop);
 child.on('error', error => {
   // eslint-disable-next-line
   console.error(error);
-  finish(1);
+  void finish(1);
 });
 
-child.on('exit', (code, signal) => {
+child.on('close', (code, signal) => {
   // Playwright waits for this wrapper to exit, not only for Vona's workers to stop.
-  finish(code ?? (signal ? 1 : 0));
+  void finish(code ?? (signal ? 1 : 0));
 });

package/repo-e2e/specs/a-commerce.spec.ts

@@ -1,6 +1,6 @@
 import type { APIRequestContext, Browser, Locator, Page, TestInfo } from '@playwright/test';
 
-import { expect, test } from '@playwright/test';
+import { expect, test } from '../scripts/managedTest.ts';
 
 const privateMarkers = ['cart', 'address', 'order', 'coupon', 'payment'];
 const addressResourceUrl =

package/repo-e2e/specs/cabloy-basic.spec.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page, Request, Route } from '@playwright/test';
 
-import { expect, test } from '@playwright/test';
+import { expect, test } from '../scripts/managedTest.ts';
 
 const studentResourceUrl =
   /\/admin\/rest\/resource\/training-student(?:%3A|:|%253A)student(?:[/?#]|$)/;

package/repo-e2e/specs/controller-boundary.spec.ts

@@ -1,6 +1,6 @@
 import type { Page } from '@playwright/test';
 
-import { expect, test } from '@playwright/test';
+import { expect, test } from '../scripts/managedTest.ts';
 
 const probeErrorMessage = 'Controller boundary probe initialization failed';
 

package/repo-e2e/specs/home-user-account.spec.ts

@@ -1,8 +1,9 @@
 import type { APIRequestContext, Page, TestInfo } from '@playwright/test';
 
-import { expect, test } from '@playwright/test';
 import path from 'node:path';
 
+import { expect, test } from '../scripts/managedTest.ts';
+
 const accountPath = '/home/user/account';
 const passwordSetPath = '/home/user/password-set';
 const passwordResetPath = '/home/user/password-reset';

package/repo-e2e/specs/markdown.spec.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test';
 
-import { expect, test } from '@playwright/test';
+import { expect, test } from '../scripts/managedTest.ts';
 
 function collectPageErrors(page: Page) {
   const errors: Error[] = [];

package/repo-e2e/specs/routed-dialog.spec.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test';
 
-import { expect, test } from '@playwright/test';
+import { expect, test } from '../scripts/managedTest.ts';
 
 declare global {
   interface Window {