@camperaid/watest 2.4.8 → 2.4.10

package/.watestrc.js

@@ -32,6 +32,12 @@ const cfg = {
    */
   webdriver_headless: process.env.WATEST_WEBDRIVER_HEADLESS,
 
+  /**
+   *  Web driver window size.
+   */
+  webdriver_window_width: process.env.WATEST_WEBDRIVER_WINDOW_WIDTH,
+  webdriver_window_height: process.env.WATEST_WEBDRIVER_WINDOW_HEIGHT,
+
   /**
    * Web driver log level.
    */

package/core/base.js

@@ -552,21 +552,34 @@ function is_out(got, expected, msg) {
 }
 
 function throws(func, exception, msg) {
-  try {
-    func();
-    fail(`${msg}: no '${exception}' exception`);
-  } catch (e) {
-    is(e?.message, exception, msg);
-  }
+  const on_no_exception = () => fail(`${msg}: no '${exception}' exception`);
+  const on_exception = e => is(e?.message, exception, msg);
+  return throw_internal(func, on_no_exception, on_exception);
 }
 
 function no_throws(func, msg) {
-  try {
-    func();
-    success(msg);
-  } catch (e) {
+  const on_no_exception = () => success(msg);
+  const on_exception = e => {
     log_error(e);
     fail(`${msg}, got: ${e?.message ?? ''} exception`);
+  };
+  return throw_internal(func, on_no_exception, on_exception);
+}
+
+function throw_internal(func, on_no_exception, on_exception) {
+  try {
+    const result = func();
+
+    // If result is a Promise, handle it asynchronously.
+    if (result instanceof Promise) {
+      return result.then(on_no_exception, on_exception);
+    }
+
+    // Sync function completed successfully (no exception)
+    on_no_exception();
+  } catch (e) {
+    // Sync function threw an exception
+    on_exception(e);
   }
 }
 

package/core/format.js

@@ -116,9 +116,10 @@ function format_warnings(count, context) {
   return colorify('warnings', label, `Total: ${count}`);
 }
 
-// Node v20 wraps stderr by '\[31m' and '\[39m' characters.
 function stderr_wrap(s) {
-  return `${s}`;
+  // Node v22 doesn't wraps stderr by '\[31m' and '\[39m'
+  // characters unlike node v20.
+  return s;
 }
 
 function stderr_unwrap(s) {

package/core/series.js

@@ -907,7 +907,8 @@ class Series {
   performInChildProcess({ name, path, loader, webdriver }) {
     let args = [];
     if (loader) {
-      args.push('--loader', loader);
+      // Use the new --import flag with register() API instead of deprecated --loader
+      args.push('--import', `data:text/javascript,import { register } from "node:module"; import { pathToFileURL } from "node:url"; register("${loader}", pathToFileURL("./"));`);
     }
     const watest_bin = nodepath.join(__dirname, '../bin/watest.js');
     args.push(

package/core/settings.js

@@ -95,6 +95,11 @@ class Settings {
       this.rc.webdriver_headless == 'true';
     this.webdriver_loglevel = this.rc.webdriver_loglevel;
 
+    this.webdriver_window_width =
+      parseInt(this.rc.webdriver_window_width) || 1366;
+    this.webdriver_window_height =
+      parseInt(this.rc.webdriver_window_height) || 768;
+
     if (this.webdrivers) {
       console.log(`Settings: ${this.webdrivers.join(', ')} webdrivers`);
     }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@camperaid/watest",
-  "version": "2.4.8",
+  "version": "2.4.10",
   "description": "Web Application Testsuite",
   "type": "module",
   "engines": {
-    "node": ">=20.16.0"
+    "node": ">=22.0.0"
   },
   "main": "index.js",
   "bin": {

package/tests/base/t_throws.js

@@ -1,7 +1,7 @@
 import { is_output, throws, no_throws } from './test.js';
 
 export async function test() {
-  // throws: success
+  // throws: success (sync)
   await is_output(
     () =>
       throws(
@@ -13,10 +13,25 @@ export async function test() {
       ),
     [`Ok: Throws error#1, got: Error#1`],
     [],
-    `throws sucess`,
+    `throws success (sync)`,
   );
 
-  // throws: fail, unexpected exception
+  // throws: success (async)
+  await is_output(
+    async () =>
+      await throws(
+        async () => {
+          throw new Error('Error#1');
+        },
+        `Error#1`,
+        `Throws error#1 async`,
+      ),
+    [`Ok: Throws error#1 async, got: Error#1`],
+    [],
+    `throws success (async)`,
+  );
+
+  // throws: fail, unexpected exception (sync)
   await is_output(
     () =>
       throws(
@@ -36,28 +51,65 @@ Error#1
 unexpected character: '2' at 6 pos, expected: '1' at '' line
 `,
     ],
-    `throws fail, unexpected exception`,
+    `throws fail, unexpected exception (sync)`,
   );
 
-  // throws: fail, no exception
+  // throws: fail, unexpected exception (async)
+  await is_output(
+    async () =>
+      await throws(
+        async () => {
+          throw new Error('Error#2');
+        },
+        `Error#1`,
+        `Wanted error#1 async`,
+      ),
+    [],
+    [
+      `Failed: Wanted error#1 async;
+got:
+Error#2
+expected:
+Error#1
+unexpected character: '2' at 6 pos, expected: '1' at '' line
+`,
+    ],
+    `throws fail, unexpected exception (async)`,
+  );
+
+  // throws: fail, no exception (sync)
   await is_output(
     () => throws(() => {}, `Error#1`, `Wanted error#1`),
     [],
     [`Failed: Wanted error#1: no 'Error#1' exception`],
-    `throws fail, no exception`,
+    `throws fail, no exception (sync)`,
   );
 
-  // no_throws(() => {}, `No exceptions`)
+  // throws: fail, no exception (async)
+  await is_output(
+    async () => await throws(async () => {}, `Error#1`, `Wanted error#1 async`),
+    [],
+    [`Failed: Wanted error#1 async: no 'Error#1' exception`],
+    `throws fail, no exception (async)`,
+  );
 
-  // no_throws: success
+  // no_throws: success (sync)
   await is_output(
     () => no_throws(() => {}, `No exceptions`),
     [`Ok: No exceptions`],
     [],
-    `no throws: sucess`,
+    `no_throws success (sync)`,
   );
 
-  // no_throws: fail
+  // no_throws: success (async)
+  await is_output(
+    async () => await no_throws(async () => {}, `No exceptions async`),
+    [`Ok: No exceptions async`],
+    [],
+    `no_throws success (async)`,
+  );
+
+  // no_throws: fail (sync)
   await is_output(
     () =>
       no_throws(() => {
@@ -68,6 +120,20 @@ unexpected character: '2' at 6 pos, expected: '1' at '' line
       v => v.startsWith('Error: Error#1'),
       `Failed: No exceptions, got: Error#1 exception`,
     ],
-    `no_throws fail`,
+    `no_throws fail (sync)`,
+  );
+
+  // no_throws: fail (async)
+  await is_output(
+    async () =>
+      await no_throws(async () => {
+        throw new Error('Error#1');
+      }, `No exceptions async`),
+    [],
+    [
+      v => v.startsWith('Error: Error#1'),
+      `Failed: No exceptions async, got: Error#1 exception`,
+    ],
+    `no_throws fail (async)`,
   );
 }

package/tests/base/test.js

@@ -7,10 +7,13 @@ export * from '../../core/format.js';
 
 function is_output(func, out, err, msg) {
   return is_output_base(
-    () => {
+    async () => {
       testflow.lock();
-      func();
-      testflow.unlock();
+      try {
+        await func();
+      } finally {
+        testflow.unlock();
+      }
     },
     out,
     err,

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

@@ -1,22 +1,22 @@
 {
   "name": "@camperaid/watest/e2e/folder",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@camperaid/watest/e2e/folder",
-      "version": "0.0.1",
+      "version": "0.0.2",
       "devDependencies": {
         "watest": "file:../../../../"
       },
       "engines": {
-        "node": ">=14.15.1"
+        "node": ">=22.0.0"
       }
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.8",
+      "version": "2.4.10",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -35,7 +35,7 @@
         "prettier": "^3.3.3"
       },
       "engines": {
-        "node": ">=20.16.0"
+        "node": ">=22.0.0"
       }
     },
     "../../../../node_modules/@bazel/runfiles": {

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

@@ -4,7 +4,7 @@
   "type": "module",
   "description": "Watest E2E Test",
   "engines": {
-    "node": ">=20.16.0"
+    "node": ">=22.0.0"
   },
   "scripts": {
     "test": "watest"

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

@@ -1,22 +1,22 @@
 {
   "name": "@camperaid/watest/e2e/loader",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@camperaid/watest/e2e/loader",
-      "version": "0.0.1",
+      "version": "0.0.2",
       "devDependencies": {
         "watest": "file:../../../../"
       },
       "engines": {
-        "node": ">=14.15.1"
+        "node": ">=20.16.0"
       }
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.8",
+      "version": "2.4.10",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -35,7 +35,7 @@
         "prettier": "^3.3.3"
       },
       "engines": {
-        "node": ">=20.16.0"
+        "node": ">=22.0.0"
       }
     },
     "../../../../node_modules/@bazel/runfiles": {

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

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

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

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.8",
+      "version": "2.4.10",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -35,7 +35,7 @@
         "prettier": "^3.3.3"
       },
       "engines": {
-        "node": ">=20.16.0"
+        "node": ">=22.0.0"
       }
     },
     "../../../../node_modules/@bazel/runfiles": {

package/tests/e2e/samples/loader_mixed/tests/ui/meta.js

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

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

@@ -1,22 +1,22 @@
 {
   "name": "@camperaid/watest/e2e/loader_multiple",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@camperaid/watest/e2e/loader_multiple",
-      "version": "0.0.1",
+      "version": "0.0.2",
       "devDependencies": {
         "watest": "file:../../../../"
       },
       "engines": {
-        "node": ">=14.15.1"
+        "node": ">=22.0.0"
       }
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.8",
+      "version": "2.4.10",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -35,7 +35,7 @@
         "prettier": "^3.3.3"
       },
       "engines": {
-        "node": ">=20.16.0"
+        "node": ">=22.0.0"
       }
     },
     "../../../../node_modules/@bazel/runfiles": {

package/tests/e2e/samples/loader_multiple/package.json

@@ -4,7 +4,7 @@
   "type": "module",
   "description": "Watest E2E Test",
   "engines": {
-    "node": ">=20.16.0"
+    "node": ">=22.0.0"
   },
   "scripts": {
     "test": "watest"

package/tests/e2e/samples/loader_multiple/tests/base/meta.js

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

package/tests/e2e/samples/loader_multiple/tests/core/meta.js

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

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

@@ -1,19 +1,22 @@
 {
   "name": "@camperaid/watest/e2e/single",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@camperaid/watest/e2e/single",
-      "version": "0.0.1",
+      "version": "0.0.2",
       "devDependencies": {
         "watest": "file:../../../../"
+      },
+      "engines": {
+        "node": ">=20.16.0"
       }
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.8",
+      "version": "2.4.10",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -32,7 +35,7 @@
         "prettier": "^3.3.3"
       },
       "engines": {
-        "node": ">=20.16.0"
+        "node": ">=22.0.0"
       }
     },
     "../../../../node_modules/@bazel/runfiles": {

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

@@ -1,22 +1,22 @@
 {
   "name": "@camperaid/watest/e2e/wd_firefox_mixed",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@camperaid/watest/e2e/wd_firefox_mixed",
-      "version": "0.0.1",
+      "version": "0.0.2",
       "devDependencies": {
         "watest": "file:../../../../"
       },
       "engines": {
-        "node": ">=14.15.1"
+        "node": ">=20.16.0"
       }
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.8",
+      "version": "2.4.10",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -35,7 +35,7 @@
         "prettier": "^3.3.3"
       },
       "engines": {
-        "node": ">=20.16.0"
+        "node": ">=22.0.0"
       }
     },
     "../../../../node_modules/@bazel/runfiles": {

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

@@ -1,22 +1,22 @@
 {
   "name": "@camperaid/watest/e2e/wd_firefox",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@camperaid/watest/e2e/wd_firefox",
-      "version": "0.0.1",
+      "version": "0.0.2",
       "devDependencies": {
         "watest": "file:../../../../"
       },
       "engines": {
-        "node": ">=14.15.1"
+        "node": ">=20.16.0"
       }
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.4.8",
+      "version": "2.4.10",
       "dev": true,
       "license": "MPL",
       "dependencies": {
@@ -35,7 +35,7 @@
         "prettier": "^3.3.3"
       },
       "engines": {
-        "node": ">=20.16.0"
+        "node": ">=22.0.0"
       }
     },
     "../../../../node_modules/@bazel/runfiles": {

package/tests/series/loader/meta.mjs

@@ -1,10 +1,10 @@
 export const loader = true;
 
-export async function resolve(specifier, context, defaultResolve) {
+export async function resolve(specifier, context, nextResolve) {
   switch (specifier) {
     case './base.mjs':
       specifier = './base_mock.mjs';
       break;
   }
-  return defaultResolve(specifier, context, defaultResolve);
+  return nextResolve(specifier, context);
 }

package/webdriver/app_driver.js

@@ -115,6 +115,19 @@ class AppDriver {
     );
   }
 
+  select(selectSelector, optionSelector, optionValue, field) {
+    return this.chain(() =>
+      this.action(`${this.uiname}.select '${optionValue}' into ${field}`)
+        .click(selectSelector, `Open ${field} select`)
+        .click(optionSelector, `Select '${optionValue}' in ${field}`)
+        .textIs(
+          selectSelector,
+          optionValue,
+          `Check '${optionValue}' option selected in ${field}`,
+        ),
+    );
+  }
+
   execute(script, descr) {
     return this.chain(() =>
       this.action(`${this.uiname}.execute ${descr}`).executeScript(

package/webdriver/driver.js

@@ -802,9 +802,13 @@ class Driver extends DriverBase {
   /**
    * Press tab key.
    */
-  tab() {
+  tab(tabCount = 1) {
     return this.run(
-      () => this.dvr.actions({ bridge: true }).sendKeys(Key.TAB).perform(),
+      () =>
+        this.dvr
+          .actions({ bridge: true })
+          .sendKeys(Array(tabCount).fill(Key.TAB).join(''))
+          .perform(),
       `Press Tab`,
     );
   }

package/webdriver/driver_base.js

@@ -26,8 +26,8 @@ import chrome from 'selenium-webdriver/chrome.js';
 
 function getChromeOptions() {
   const chromeOptions = new chrome.Options().windowSize({
-    width: 1366,
-    height: 768,
+    width: settings.webdriver_window_width,
+    height: settings.webdriver_window_height,
   });
   if (settings.webdriver_headless) {
     chromeOptions.addArguments('headless');