@camperaid/watest 2.5.4 → 2.5.6

package/.watestrc.js

@@ -43,6 +43,12 @@ const cfg = {
    */
   webdriver_loglevel: process.env.WATEST_WEBDRIVER_LOGLEVEL,
 
+  /**
+   * Additional Chrome arguments.
+   * JSON array, e.g.: ["enable-unsafe-swiftshader", "use-gl=swiftshader"]
+   */
+  webdriver_chrome_args: process.env.WATEST_WEBDRIVER_CHROME_ARGS,
+
   /**
    * Web drivers to run tests for.
    */

package/core/series.js

@@ -481,6 +481,7 @@ class Series {
         failures_info: [],
         skip_on_fail: 'skip-on-fail',
         init_or_uninit: true,
+        ...(test_module.timeout && { timeout: test_module.timeout }),
       });
     }
 
@@ -500,13 +501,17 @@ class Series {
         testname: path,
       });
 
-      tests.push({
+      const testObj = {
         name,
         path,
         func: test_wrap,
         webdriver,
         failures_info,
-      });
+      };
+      if (test_module.timeout) {
+        testObj.timeout = test_module.timeout;
+      }
+      tests.push(testObj);
     }
 
     // Add tests from subfolders.
@@ -531,6 +536,7 @@ class Series {
         failures_info: [],
         skip_on_fail: 'skip-on-fail',
         init_or_uninit: true,
+        ...(test_module.timeout && { timeout: test_module.timeout }),
       });
     }
 
@@ -653,6 +659,7 @@ class Series {
         skip_on_fail,
         run_in_child_process,
         init_or_uninit,
+        timeout,
       } = test;
 
       if (stop && !name.endsWith('uninit')) {
@@ -678,6 +685,7 @@ class Series {
 
       // Invoke a test.
       log(`\n!Running: ${name}, path: ${path}\n`);
+
       let start_time = new Date();
       let kungFuDeathGrip = null;
       let kungFuDeathGripResolve = null;
@@ -695,22 +703,21 @@ class Series {
       try {
         this.core.setExpectedFailures(failures_info);
 
-        // If timeout is given then race it against the test.
-        if (settings.timeout) {
+        // If timeout is given (from meta.js or settings) then race it against the test.
+        const effectiveTimeout = timeout ?? settings.timeout;
+        if (effectiveTimeout) {
+          const timeoutMs = effectiveTimeout * 1000;
           kungFuDeathGrip = new Promise(
             resolve => (kungFuDeathGripResolve = resolve),
           ).then(value => {
             if (value != kKungFuDeathGripCancelled) {
               fail(
-                `Test ${name} takes longer than ${settings.timeout}ms. It's either slow or never ends.`,
+                `Test ${name} takes longer than ${effectiveTimeout}s. It's either slow or never ends.`,
               );
               return kKungFuDeathGripTimeout;
             }
           });
-          kungFuDeathGripTimer = setTimeout(
-            kungFuDeathGripResolve,
-            settings.timeout,
-          );
+          kungFuDeathGripTimer = setTimeout(kungFuDeathGripResolve, timeoutMs);
           let retval = await Promise.race([func(), kungFuDeathGrip]);
           if (retval != kKungFuDeathGripTimeout) {
             clearTimeout(kungFuDeathGripTimer);

package/core/settings.js

@@ -54,11 +54,11 @@ class Settings {
   }
 
   get testFilePattern() {
-    return this.rc.test_file_pattern || /^t[-_]/;
+    return this.rc?.test_file_pattern || /^t[-_]/;
   }
 
   get timeout() {
-    return parseInt(this.rc.timeout) || 0;
+    return parseInt(this.rc?.timeout) || 0;
   }
 
   setupTmpStorageDir() {
@@ -112,12 +112,33 @@ class Settings {
       this.rc.webdriver_headless == true ||
       this.rc.webdriver_headless == 'true';
     this.webdriver_loglevel = this.rc.webdriver_loglevel;
+    this.webdriver_chrome_args = [];
+
+    if (typeof this.rc.webdriver_chrome_args == 'string') {
+      try {
+        const parsed = JSON.parse(this.rc.webdriver_chrome_args);
+        if (Array.isArray(parsed)) {
+          this.webdriver_chrome_args = parsed;
+        }
+      } catch (e) {
+        console.error(
+          `Settings: failed to parse webdriver_chrome_args '${this.rc.webdriver_chrome_args}'`,
+          e,
+        );
+      }
+    }
 
     this.webdriver_window_width =
       parseInt(this.rc.webdriver_window_width) || 1366;
     this.webdriver_window_height =
       parseInt(this.rc.webdriver_window_height) || 768;
 
+    if (!this.silent) {
+      console.log(
+        `Settings: webdriver_chrome_args=${JSON.stringify(this.webdriver_chrome_args)}`,
+      );
+    }
+
     if (this.webdrivers && !this.silent) {
       console.log(`Settings: ${this.webdrivers.join(', ')} webdrivers`);
     }

package/package.json

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

package/tests/series/perform/t-timeout.js

@@ -0,0 +1,107 @@
+import { is_test_output } from '../test.js';
+import { success } from '../../../core/core.js';
+import { Core } from '../../../core/core.js';
+import { Series } from '../../../core/series.js';
+
+class MockLogPipe {
+  attach() {
+    return Promise.resolve();
+  }
+  release() {
+    return Promise.resolve();
+  }
+  logToFile() {}
+}
+
+function make_perform_with_timeout(tests) {
+  return async () => {
+    const series = new Series('tests/', {
+      core: new Core(),
+      LogPipe: new MockLogPipe(),
+    });
+    try {
+      await series.perform({ folder: 'tests/', tests });
+    } finally {
+      series.shutdown();
+    }
+  };
+}
+
+export async function test() {
+  // Test that timeout from meta.js causes test to fail after specified time
+  await is_test_output(
+    make_perform_with_timeout([
+      {
+        name: 't-slow.js',
+        path: 'tests/t-slow.js',
+        func: () => new Promise(resolve => setTimeout(resolve, 500)),
+        failures_info: [],
+        timeout: 0.05, // 50ms timeout in seconds
+      },
+    ]),
+    [
+      '\x1B[38;5;99mStarted\x1B[0m tests/',
+      '!Running: t-slow.js, path: tests/t-slow.js',
+      '>t-slow.js completed in',
+      '\x1B[38;5;243mCompleted\x1B[0m tests/',
+      'Testsuite: shutdown',
+    ],
+    [
+      "\x1B[31mFailed:\x1B[0m Test t-slow.js takes longer than 0.05s. It's either slow or never ends.",
+      '\x1B[31m>t-slow.js\x1B[0m has 1 failure(s)',
+    ],
+    'meta timeout causes test to fail',
+  );
+
+  // Test that test completes normally when timeout is not exceeded
+  await is_test_output(
+    make_perform_with_timeout([
+      {
+        name: 't-fast.js',
+        path: 'tests/t-fast.js',
+        func: () => {
+          success('fast test passes');
+          return Promise.resolve();
+        },
+        failures_info: [],
+        timeout: 1, // 1 second timeout
+      },
+    ]),
+    [
+      '\x1B[38;5;99mStarted\x1B[0m tests/',
+      '!Running: t-fast.js, path: tests/t-fast.js',
+      '\x1B[32mOk:\x1B[0m fast test passes',
+      '>t-fast.js completed in',
+      '\x1B[38;5;243mCompleted\x1B[0m tests/',
+      'Testsuite: shutdown',
+    ],
+    [],
+    'test completes within timeout',
+  );
+
+  // Test that no timeout applies when timeout is undefined
+  await is_test_output(
+    make_perform_with_timeout([
+      {
+        name: 't-no-timeout.js',
+        path: 'tests/t-no-timeout.js',
+        func: () => {
+          success('no timeout test passes');
+          return new Promise(resolve => setTimeout(resolve, 10));
+        },
+        failures_info: [],
+        // timeout: undefined - no timeout set
+      },
+    ]),
+    [
+      '\x1B[38;5;99mStarted\x1B[0m tests/',
+      '!Running: t-no-timeout.js, path: tests/t-no-timeout.js',
+      '\x1B[32mOk:\x1B[0m no timeout test passes',
+      '>t-no-timeout.js completed in',
+      '\x1B[38;5;243mCompleted\x1B[0m tests/',
+      'Testsuite: shutdown',
+    ],
+    [],
+    'test runs without timeout when not specified',
+  );
+}

package/tests/series/run/t-debunk-failure.js

@@ -20,6 +20,7 @@ export async function test() {
   const expected_stdout = [
     'Settings: no temporary storage dir',
     'Settings: logging into /tmp',
+    'Settings: webdriver_chrome_args=[]',
     'Settings: chrome webdrivers',
     '\x1B[38;5;99mStarted\x1B[0m mac/',
     '\x1B[38;5;99mStarted\x1B[0m mac/unit',

package/tests/series/run/t-debunk-success.js

@@ -33,6 +33,7 @@ export async function test() {
   const expected_stdout = [
     'Settings: no temporary storage dir',
     'Settings: logging into /tmp',
+    'Settings: webdriver_chrome_args=[]',
     'Settings: chrome webdrivers',
     ...expected_out_for_success,
     ...expected_out_for_success,

package/tests/series/run/t-nested.js

@@ -35,6 +35,7 @@ export async function test() {
     [
       'Settings: no temporary storage dir',
       'Settings: logging into /tmp',
+      'Settings: webdriver_chrome_args=[]',
       'Settings: chrome webdrivers',
       '\x1B[38;5;99mStarted\x1B[0m mac/',
       '\x1B[38;5;99mStarted\x1B[0m mac/unit',

package/tests/series/run/t-verify-webdriver.js

@@ -33,6 +33,7 @@ export async function test() {
   const expected_stdout = [
     'Settings: no temporary storage dir',
     'Settings: logging into /tmp',
+    'Settings: webdriver_chrome_args=[]',
     'Settings: chrome webdrivers',
     '\x1B[38;5;99mStarted\x1B[0m mac/',
     '\x1B[38;5;99mStarted\x1B[0m mac/webdriver',

package/tests/series/run/t-verify.js

@@ -33,6 +33,7 @@ export async function test() {
   const expected_stdout = [
     'Settings: no temporary storage dir',
     'Settings: logging into /tmp',
+    'Settings: webdriver_chrome_args=[]',
     'Settings: chrome webdrivers',
     '\x1B[38;5;99mStarted\x1B[0m mac/',
     '\x1B[38;5;99mStarted\x1B[0m mac/unit',

package/tests/series/servicer/t-nested-servicer-lifecycle.js

@@ -35,6 +35,7 @@ export async function test() {
     [
       'Settings: no temporary storage dir',
       'Settings: logging into /tmp',
+      'Settings: webdriver_chrome_args=[]',
       'Settings: chrome webdrivers',
       '\x1B[38;5;99mStarted\x1B[0m mac/',
 

package/tests/series/servicer/t-servicer-no-services.js

@@ -26,6 +26,7 @@ export async function test() {
     [
       'Settings: no temporary storage dir',
       'Settings: logging into /tmp',
+      'Settings: webdriver_chrome_args=[]',
       'Settings: chrome webdrivers',
       '\x1B[38;5;99mStarted\x1B[0m mac/',
       '!Running: mac/init, path: tests/meta.js',

package/tests/series/servicer/t-servicer-type-switching.js

@@ -66,6 +66,7 @@ export async function test() {
     [
       'Settings: no temporary storage dir',
       'Settings: logging into /tmp',
+      'Settings: webdriver_chrome_args=[]',
       'Settings: chrome webdrivers',
       '\x1B[38;5;99mStarted\x1B[0m mac/',
       '\x1B[38;5;99mStarted\x1B[0m mac/folder1',

package/tests/series/servicer/t-servicer.js

@@ -22,6 +22,7 @@ export async function test() {
     [
       'Settings: no temporary storage dir',
       'Settings: logging into /tmp',
+      'Settings: webdriver_chrome_args=[]',
       'Settings: chrome webdrivers',
       '\x1B[38;5;99mStarted\x1B[0m mac/',
       '!Running: mac/init, path: tests/meta.js',

package/webdriver/driver-base.js

@@ -30,7 +30,7 @@ function getChromeOptions() {
     height: settings.webdriver_window_height,
   });
   if (settings.webdriver_headless) {
-    chromeOptions.addArguments('headless');
+    chromeOptions.addArguments('headless=new');
   }
   if (settings.webdriver == 'chrome-mobile') {
     chromeOptions.setMobileEmulation({
@@ -44,6 +44,9 @@ function getChromeOptions() {
   chromeOptions.addArguments('no-sandbox');
   chromeOptions.addArguments('disable-dev-shm-usage');
 
+  for (const arg of settings.webdriver_chrome_args || []) {
+    chromeOptions.addArguments(arg);
+  }
   return chromeOptions;
 }