@camperaid/watest 2.5.0 → 2.5.2

package/logging/logpipe.js

@@ -2,7 +2,7 @@ import path from 'path';
 
 import { FileStream as DefaultFileStream } from './filestream.js';
 import { log, log_error } from './logging.js';
-import settings from '../core/settings.js';
+import { settings } from '../core/settings.js';
 
 /**
  * A single instance of a logpipe writing to std and file streams.
@@ -15,6 +15,7 @@ class LogPipeInstance {
 
   attach(invocation) {
     this.invocation = invocation;
+    this.run = settings.run;
     this.log_dir = path.join(settings.log_dir, this.invocation);
     if (this.suppress_logging) {
       return;
@@ -28,7 +29,7 @@ class LogPipeInstance {
       log_error(e);
     });
 
-    return settings.logger.testRunStarted({ run: settings.run, invocation });
+    return settings.logger.testRunStarted({ run: this.run, invocation });
   }
 
   async logScreenshot(pic) {
@@ -41,7 +42,7 @@ class LogPipeInstance {
     log(`Screenshot is captured and written to ${stream.filepath}`);
 
     await settings.logger.writeLogFile({
-      run: settings.run,
+      run: this.run,
       invocation: this.invocation,
       name,
       content,
@@ -50,30 +51,42 @@ class LogPipeInstance {
 
   logSourceMap() {
     return settings.logger.writeSourceMap({
-      run: settings.run,
+      run: this.run,
       invocation: this.invocation,
     });
   }
 
   release() {
-    return (
-      !this.suppress_logging &&
-      this.fstream
-        .end()
-        .then(() => this.fstream.readFile())
-        .then(content =>
-          settings.logger.writeLogFile({
-            run: settings.run,
+    if (this.suppress_logging || !this.fstream) {
+      return Promise.resolve();
+    }
+
+    const filepath = this.fstream.filepath;
+
+    return this.fstream
+      .end()
+      .then(() => this.fstream.readFile())
+      .then(content =>
+        settings.logger.writeLogFile({
+          run: this.run,
+          invocation: this.invocation,
+          name: this.fname,
+          content,
+          zip: true,
+        }),
+      )
+      .catch(e => {
+        log_error(
+          `[logpipe:error] ✗ Logging shutdown failed for ${filepath}:`,
+          {
+            filepath,
             invocation: this.invocation,
-            name: this.fname,
-            content,
-            zip: true,
-          }),
-        )
-        .catch(e => {
-          log_error(`Logging shutdown rejected: ${e}`);
-        })
-    );
+            error: e.message,
+            code: e.code,
+            stack: e.stack,
+          },
+        );
+      });
   }
 }
 
@@ -127,6 +140,10 @@ class LogPipe {
     // Remove the pipe from the stack to prevent anyone writing into it after
     // its release.
     let pipeToRelease = this.stack.pop();
+    if (!pipeToRelease) {
+      return Promise.resolve();
+    }
+
     await pipeToRelease.release(...args);
 
     if (this.suppress_logging) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camperaid/watest",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Web Application Testsuite",
   "type": "module",
   "engines": {

package/tests/base/{t_core.js → t-core.js}

@@ -1,14 +1,21 @@
 import { colorify, group, fail, success, is_output } from './test.js';
 
 export async function test() {
-  // console.log
-  await is_output(() => console.log(3), [`3\n`], [], `console.log(3)`);
+  // console.log - Node adds yellow color codes to numbers in TTY
+  const colored3 = `\x1b[33m3\x1b[39m\n`;
+
+  await is_output(
+    () => console.log(3),
+    [colored3],
+    [],
+    `console.log(3)`,
+  );
 
   // console.error
   await is_output(
     () => console.error(3),
     [],
-    [`3\n`],
+    [colored3],
     `console.error(3)`,
   );
 

package/tests/base/t-system.js

@@ -0,0 +1,59 @@
+import { ok, contains } from '../../index.js';
+import { runCommand, runBashScript, execCommand } from '../../core/system.js';
+
+export async function test() {
+  // Test 1: runCommand with echo
+  {
+    const result = await runCommand('echo', ['hello', 'world']);
+    ok(result.exitCode === 0, 'echo command should succeed');
+    ok(result.stdout === 'hello world', 'stdout should contain echo output');
+    ok(result.stderr === '', 'stderr should be empty');
+    ok(result.stdoutLines.length === 1, 'should have one stdout line');
+    ok(result.stdoutLines[0] === 'hello world', 'stdout line should match');
+  }
+
+  // Test 2: runBashScript with simple script
+  {
+    const script = 'echo "test script"; echo "line 2"';
+    const result = await runBashScript(script);
+    ok(result.exitCode === 0, 'bash script should succeed');
+    contains(result.stdout, 'test script', 'should contain first echo');
+    contains(result.stdout, 'line 2', 'should contain second echo');
+    ok(result.stdoutLines.length === 2, 'should have two stdout lines');
+  }
+
+  // Test 3: execCommand for simple cases
+  {
+    const output = await execCommand('echo', ['simple test']);
+    ok(output === 'simple test', 'execCommand should return stdout directly');
+  }
+
+  // Test 4: runCommand with failing command
+  {
+    const result = await runCommand('bash', ['-c', 'echo "error" >&2; exit 1']);
+    ok(result.exitCode === 1, 'failing command should return exit code 1');
+    ok(result.stdout === '', 'stdout should be empty');
+    ok(result.stderr === 'error', 'stderr should contain error message');
+  }
+
+  // Test 5: execCommand should throw on failure
+  {
+    let threw = false;
+    try {
+      await execCommand('bash', ['-c', 'exit 1']);
+    } catch (error) {
+      threw = true;
+      contains(error.message, 'exit code 1', 'error should mention exit code');
+    }
+    ok(threw, 'execCommand should throw on non-zero exit code');
+  }
+
+  // Test 6: runBashScript with arguments
+  {
+    const script = 'echo "arg1: $1, arg2: $2"';
+    const result = await runBashScript(script, ['first', 'second']);
+    ok(result.exitCode === 0, 'bash script with args should succeed');
+    contains(result.stdout, 'arg1: first', 'should pass first argument');
+    contains(result.stdout, 'arg2: second', 'should pass second argument');
+  }
+}

package/tests/base/{t_throws.js → t-throws.js}

@@ -136,4 +136,71 @@ unexpected character: '2' at 6 pos, expected: '1' at '' line
     ],
     `no_throws fail (async)`,
   );
+
+  // throws: accept object descriptor (statusCode + JSON body)
+  await is_output(
+    () =>
+      throws(
+        () => {
+          const err = new Error(
+            'HTTP error code 422 for https://api.digitalocean.com/v2/droplets',
+          );
+          err.statusCode = 422;
+          err.responseBody = JSON.stringify({
+            id: 'unprocessable_entity',
+            message: 'You specified an invalid image for Droplet creation.',
+          });
+          throw err;
+        },
+        {
+          statusCode: 422,
+          responseBody: JSON.stringify({
+            id: 'unprocessable_entity',
+            message: 'You specified an invalid image for Droplet creation.',
+          }),
+        },
+        `Throws error descriptor`,
+      ),
+    [
+      `Ok: Throws error descriptor, got: {statusCode: 422, responseBody: '{"id":"unprocessable_entity","message":"You specified an invalid image for Droplet creation."}'}`,
+    ],
+    [],
+    `throws accept object descriptor`,
+  );
+
+  // throws: accept RegExp for message matching
+  await is_output(
+    () =>
+      throws(
+        () => {
+          throw new Error(
+            'Unexpected 404 response code for https://example.com/test from droplet 1',
+          );
+        },
+        /404|Unexpected/,
+        `Throws with RegExp`,
+      ),
+    [
+      `Ok: Throws with RegExp 'Unexpected 404 response code for https://example.com/test from droplet 1' matches /404|Unexpected/ regexp`,
+    ],
+    [],
+    `throws accept RegExp pattern`,
+  );
+
+  // throws: fail RegExp that doesn't match
+  await is_output(
+    () =>
+      throws(
+        () => {
+          throw new Error('Some other error message');
+        },
+        /404|Unexpected/,
+        `RegExp should match`,
+      ),
+    [],
+    [
+      `Failed: RegExp should match 'Some other error message' doesn't match /404|Unexpected/ regexp`,
+    ],
+    `throws fail RegExp no match`,
+  );
 }

package/tests/base/test.js

@@ -1,8 +1,7 @@
 import { testflow } from '../../core/core.js';
 import { is_output as is_output_base } from '../../core/base.js';
 
-export * from '../../core/base.js';
-export * from '../../core/core.js';
+export * from '../test.js';
 export * from '../../core/format.js';
 
 function is_output(func, out, err, msg) {

package/tests/deps/samples/nested/.watestrc.js

@@ -0,0 +1,3 @@
+export default {
+  tests_folder: 'tests',
+};

package/tests/deps/samples/nested/tests/meta.js

@@ -0,0 +1 @@
+export const folders = ['services'];

package/tests/deps/samples/nested/tests/services/meta.js

@@ -0,0 +1 @@
+export const folders = ['ws'];

package/tests/deps/samples/nested/tests/services/ws/meta.js

@@ -0,0 +1 @@
+export const folders = ['webservice'];

package/tests/deps/samples/nested/tests/services/ws/webservice/meta.js

@@ -0,0 +1,2 @@
+export const servicer = 'docker';
+export const services = ['ws'];

package/tests/deps/samples/nested/tests/services/ws/webservice/t-ws.js

@@ -0,0 +1,3 @@
+export async function test() {
+  // Dummy test
+}

package/tests/deps/samples/unified/.watestrc.js

@@ -0,0 +1,3 @@
+export default {
+  webdrivers: ['chrome', 'firefox'],
+};

package/tests/deps/samples/unified/tests/e2e/meta.js

@@ -0,0 +1,4 @@
+export const servicer = 'kubernetes';
+export const webdriver = true;
+export const services = ['db', ['nginx', { env: { CA_TEST: 'value' } }]];
+export const folders = ['pages'];

package/tests/deps/samples/unified/tests/e2e/pages/meta.js

@@ -0,0 +1 @@
+export const services = ['request'];

package/tests/deps/samples/unified/tests/e2e/pages/t-example.js

@@ -0,0 +1,3 @@
+export async function test() {
+  // Dummy test
+}

package/tests/deps/samples/unified/tests/e2e/t-example.js

@@ -0,0 +1,3 @@
+export async function test() {
+  // Dummy test
+}

package/tests/deps/samples/unified/tests/integration/meta.js

@@ -0,0 +1,3 @@
+export const webdriver = true;
+export const servicer = 'docker';
+export const services = ['db'];

package/tests/deps/samples/unified/tests/lib/t-example.js

@@ -0,0 +1,3 @@
+export async function test() {
+  // Dummy test
+}

package/tests/deps/samples/unified/tests/meta.js

@@ -0,0 +1,8 @@
+export const folders = ['e2e', 'integration', 'lib', 'services'];
+
+export const grid = {
+  'e2e+': ['tests/e2e'],
+  'integration': ['tests/integration'],
+  'lib': ['tests/lib'],
+  'services': ['tests/services'],
+};

package/tests/deps/samples/unified/tests/services/meta.js

@@ -0,0 +1,3 @@
+export const servicer = 'docker';
+export const services = ['inbucket'];
+export const folders = ['request'];

package/tests/deps/samples/unified/tests/services/request/meta.js

@@ -0,0 +1 @@
+export const services = ['request'];

package/tests/deps/samples/unified/tests/services/t-example.js

@@ -0,0 +1,3 @@
+export async function test() {
+  // Dummy test
+}

package/tests/deps/t-parse-cell-syntax.js

@@ -0,0 +1,6 @@
+import { is, parseCellSyntax } from './test.js';
+
+export async function test() {
+  is(parseCellSyntax('e2e'), { name: 'e2e', split: false }, 'without +');
+  is(parseCellSyntax('e2e+'), { name: 'e2e', split: true }, 'with +');
+}

package/tests/deps/t-parse-grid-args.js

@@ -0,0 +1,11 @@
+import { is, parseGridArgs } from './test.js';
+
+export async function test() {
+  const args1 = parseGridArgs(['tests/e2e', 'tests/www', 'chrome', 'firefox']);
+  is(args1.paths, ['tests/e2e', 'tests/www'], 'paths');
+  is(args1.webdrivers, ['chrome', 'firefox'], 'webdrivers');
+
+  const args2 = parseGridArgs([]);
+  is(args2.paths, [], 'empty paths');
+  is(args2.webdrivers, [], 'empty webdrivers');
+}

package/tests/deps/t-watest-deps.js

@@ -0,0 +1,37 @@
+import { testDeps } from './test.js';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const unifiedSamplePath = path.join(__dirname, 'samples/unified');
+const nestedSamplePath = path.join(__dirname, 'samples/nested');
+
+export async function test() {
+  // Test specific path: tests/e2e
+  await testDeps(['tests/e2e'], unifiedSamplePath, {
+    servicers: ['kubernetes'],
+    webdriver: true,
+    services: ['db', 'nginx', 'request'],
+  });
+
+  // Test no arguments (should default to tests/)
+  await testDeps([], unifiedSamplePath, {
+    servicers: ['kubernetes', 'docker'],
+    webdriver: true,
+    services: ['db', 'nginx', 'request', 'inbucket'],
+  });
+
+  // Test with deeply nested test file path
+  await testDeps(['tests/services/ws/webservice/t-ws.js'], nestedSamplePath, {
+    servicers: ['docker'],
+    webdriver: false,
+    services: ['ws'],
+  });
+
+  // Test with nested directory path
+  await testDeps(['tests/services/ws/webservice'], nestedSamplePath, {
+    servicers: ['docker'],
+    webdriver: false,
+    services: ['ws'],
+  });
+}

package/tests/deps/t-watest-grid.js

@@ -0,0 +1,122 @@
+import { is, testGrid } from './test.js';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const samplesPath = path.join(__dirname, 'samples/unified');
+
+export async function test() {
+  // Default browsers from .watestrc.js (chrome, firefox) - splits + cells
+  const result1 = await testGrid([], samplesPath);
+  is(
+    result1,
+    {
+      'e2e-chrome': {
+        paths: ['tests/e2e'],
+        webdrivers: 'chrome',
+        servicers: ['kubernetes'],
+        services: ['db', 'nginx', 'request'],
+      },
+      'e2e-firefox': {
+        paths: ['tests/e2e'],
+        webdrivers: 'firefox',
+        servicers: ['kubernetes'],
+        services: ['db', 'nginx', 'request'],
+      },
+      'integration': {
+        paths: ['tests/integration'],
+        webdrivers: 'chrome firefox',
+        servicers: ['docker'],
+        services: ['db'],
+      },
+      'lib': {
+        paths: ['tests/lib'],
+        webdrivers: '',
+        servicers: [],
+        services: [],
+      },
+      'services': {
+        paths: ['tests/services'],
+        webdrivers: '',
+        servicers: ['docker'],
+        services: ['inbucket', 'request'],
+      },
+    },
+    'default browsers split + cells',
+  );
+
+  // Single browser - no split even for + cells
+  const result2 = await testGrid(['chrome'], samplesPath);
+  is(
+    result2,
+    {
+      e2e: {
+        paths: ['tests/e2e'],
+        webdrivers: 'chrome',
+        servicers: ['kubernetes'],
+        services: ['db', 'nginx', 'request'],
+      },
+      integration: {
+        paths: ['tests/integration'],
+        webdrivers: 'chrome',
+        servicers: ['docker'],
+        services: ['db'],
+      },
+      lib: {
+        paths: ['tests/lib'],
+        webdrivers: '',
+        servicers: [],
+        services: [],
+      },
+      services: {
+        paths: ['tests/services'],
+        webdrivers: '',
+        servicers: ['docker'],
+        services: ['inbucket', 'request'],
+      },
+    },
+    'single browser no split',
+  );
+
+  // Multiple browsers without split (no + cells, explicit browsers)
+  const result3 = await testGrid(
+    ['tests/lib', 'chrome', 'firefox'],
+    samplesPath,
+  );
+  is(
+    result3,
+    {
+      lib: {
+        paths: ['tests/lib'],
+        webdrivers: '',
+        servicers: [],
+        services: [],
+      },
+    },
+    'no webdriver cell with multiple browsers',
+  );
+
+  // Filter by paths with multiple browsers (+ cell splits)
+  const result4 = await testGrid(
+    ['tests/e2e', 'chrome', 'firefox'],
+    samplesPath,
+  );
+  is(
+    result4,
+    {
+      'e2e-chrome': {
+        paths: ['tests/e2e'],
+        webdrivers: 'chrome',
+        servicers: ['kubernetes'],
+        services: ['db', 'nginx', 'request'],
+      },
+      'e2e-firefox': {
+        paths: ['tests/e2e'],
+        webdrivers: 'firefox',
+        servicers: ['kubernetes'],
+        services: ['db', 'nginx', 'request'],
+      },
+    },
+    'filtered paths with split',
+  );
+}

package/tests/deps/test.js

@@ -0,0 +1,63 @@
+export * from '../test.js';
+export * from '../../core/deps.js';
+
+import { is } from '../test.js';
+import { spawn } from '../../core/spawn.js';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+/**
+ * Helper to test watest --deps command
+ * @param {string[]} paths - Paths to pass to --deps (empty array for no args)
+ * @param {string} samplesPath - Path to samples directory
+ * @param {Object} expected - Expected metadata result
+ */
+export async function testDeps(paths, samplesPath, expected) {
+  let stdout = '';
+  let stderr = '';
+
+  const args = ['../../../../bin/watest.js', '--deps', ...paths];
+
+  await spawn('node', args, { cwd: samplesPath }, buffer => {
+    for (let { str_data, is_stdout } of buffer) {
+      if (is_stdout) stdout += str_data;
+      else stderr += str_data;
+    }
+  });
+
+  is(stderr, '', 'no errors');
+
+  // Filter out Settings lines before JSON
+  const jsonStart = stdout.indexOf('{');
+  const jsonStr = jsonStart >= 0 ? stdout.slice(jsonStart) : stdout;
+
+  const meta = JSON.parse(jsonStr);
+  const pathsDesc =
+    paths.length === 0 ? 'no args (defaults to tests/)' : paths.join(', ');
+  is(meta, expected, `deps for ${pathsDesc}`);
+}
+
+/**
+ * Helper to test watest --grid command
+ * @param {string[]} args - Arguments to pass to --grid
+ * @param {string} cwd - Working directory for the command
+ * @returns {Promise<Object>} Parsed grid JSON output
+ */
+export async function testGrid(args, cwd) {
+  let stdout = '';
+  const watestBin = path.join(__dirname, '../../bin/watest.js');
+
+  await spawn('node', [watestBin, '--grid', ...args], { cwd }, buffer => {
+    for (let { str_data, is_stdout } of buffer) {
+      if (is_stdout) stdout += str_data;
+    }
+  });
+
+  const jsonStart = stdout.indexOf('{');
+  if (jsonStart < 0) {
+    throw new Error(`No JSON in output: ${stdout}`);
+  }
+  return JSON.parse(stdout.slice(jsonStart));
+}

package/tests/e2e/samples/folder/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.10",
+      "version": "2.5.1",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -187,6 +187,7 @@
       "version": "8.12.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -450,6 +451,7 @@
       "version": "9.8.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",

package/tests/e2e/samples/loader/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.10",
+      "version": "2.5.1",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -187,6 +187,7 @@
       "version": "8.12.1",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -450,6 +451,7 @@
       "version": "9.8.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",

package/tests/e2e/samples/loader/tests/meta.js

@@ -3,7 +3,7 @@ export const loader = true;
 export async function resolve(specifier, context, nextResolve) {
   switch (specifier) {
     case './module.js':
-      specifier = './module_mock.js';
+      specifier = './module-mock.js';
       break;
   }
   return nextResolve(specifier, context);