@camperaid/watest 2.5.1 → 2.5.2

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);

package/tests/e2e/samples/{loader_mixed → loader-mixed}/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_multiple/tests/core → loader-mixed/tests/ui}/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);

package/tests/e2e/samples/{loader_multiple → loader-multiple}/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_multiple → loader-multiple}/tests/base/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);

package/tests/e2e/samples/{loader_mixed/tests/ui → loader-multiple/tests/core}/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);

package/tests/e2e/samples/single/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/{wd_mixed → wd-mixed}/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/{wd_single → wd-single}/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/{t_folder.js → t-folder.js}

@@ -7,9 +7,9 @@ export async function test() {
     [
       '\x1B[38;5;99mStarted\x1B[0m sample/',
       '\x1B[38;5;99mStarted\x1B[0m sample/unit',
-      '!Running: sample/unit/t_test.js, path: tests/unit/t_test.js',
+      '!Running: sample/unit/t-test.js, path: tests/unit/t-test.js',
       '\x1B[32mOk:\x1B[0m works!',
-      '>sample/unit/t_test.js completed in',
+      '>sample/unit/t-test.js completed in',
       '\x1B[38;5;243mCompleted\x1B[0m sample/unit',
       '\x1B[102mSuccess!\x1B[0m Total: 1',
       '\x1B[38;5;243mCompleted\x1B[0m sample/',

package/tests/e2e/{t_loader_mixed.js → t-loader-mixed.js}

@@ -1,20 +1,20 @@
 import { is, run_e2e_tests } from './test.js';
 
 export async function test() {
-  let output = await run_e2e_tests('loader_mixed');
+  let output = await run_e2e_tests('loader-mixed');
   is(
     output.stdout,
     [
       '\x1B[38;5;99mStarted\x1B[0m sample/',
       '\x1B[38;5;99mStarted\x1B[0m sample/unit',
-      '!Running: sample/unit/t_test.js, path: tests/unit/t_test.js',
+      '!Running: sample/unit/t-test.js, path: tests/unit/t-test.js',
       '\x1B[32mOk:\x1B[0m Real!, got: real',
-      '>sample/unit/t_test.js completed in',
+      '>sample/unit/t-test.js completed in',
       '\x1B[38;5;243mCompleted\x1B[0m sample/unit',
       '\x1B[38;5;99mStarted\x1B[0m sample/ui',
-      '!Running: sample/ui/t_test.js, path: tests/ui/t_test.js',
+      '!Running: sample/ui/t-test.js, path: tests/ui/t-test.js',
       '\x1B[32mOk:\x1B[0m Mocked!, got: mocked',
-      '>sample/ui/t_test.js completed in',
+      '>sample/ui/t-test.js completed in',
       '\x1B[38;5;243mCompleted\x1B[0m sample/ui',
       'Elapsed:',
       'Testsuite: shutdown',

package/tests/e2e/{t_loader_multiple_patterns.js → t-loader-multiple-patterns.js}

@@ -1,24 +1,24 @@
 import { is, run_e2e_tests } from './test.js';
 
 export async function test() {
-  let output = await run_e2e_tests('loader_multiple', {
-    patterns: ['tests/base/t_btest.js', 'tests/core/t_ctest.js'],
+  let output = await run_e2e_tests('loader-multiple', {
+    patterns: ['tests/base/t-btest.js', 'tests/core/t-ctest.js'],
   });
   is(
     output.stdout,
     [
       '\x1B[38;5;99mStarted\x1B[0m sample/',
       '\x1B[38;5;99mStarted\x1B[0m sample/base',
-      '!Running: sample/base/t_btest.js, path: tests/base/t_btest.js',
+      '!Running: sample/base/t-btest.js, path: tests/base/t-btest.js',
       '\x1B[32mOk:\x1B[0m Mocked!, got: mocked',
-      '>sample/base/t_btest.js completed in',
+      '>sample/base/t-btest.js completed in',
       '\x1B[38;5;243mCompleted\x1B[0m sample/base',
       'Elapsed:',
       'Testsuite: shutdown',
       '\x1B[38;5;99mStarted\x1B[0m sample/core',
-      '!Running: sample/core/t_ctest.js, path: tests/core/t_ctest.js',
+      '!Running: sample/core/t-ctest.js, path: tests/core/t-ctest.js',
       '\x1B[32mOk:\x1B[0m Mocked!, got: mocked',
-      '>sample/core/t_ctest.js completed in',
+      '>sample/core/t-ctest.js completed in',
       '\x1B[38;5;243mCompleted\x1B[0m sample/core',
       'Elapsed:',
       'Testsuite: shutdown',