@camperaid/watest 2.5.5 → 2.5.7

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 }),
       });
     }
 
@@ -535,6 +536,7 @@ class Series {
         failures_info: [],
         skip_on_fail: 'skip-on-fail',
         init_or_uninit: true,
+        ...(test_module.timeout && { timeout: test_module.timeout }),
       });
     }
 
@@ -715,10 +717,7 @@ class Series {
               return kKungFuDeathGripTimeout;
             }
           });
-          kungFuDeathGripTimer = setTimeout(
-            kungFuDeathGripResolve,
-            timeoutMs,
-          );
+          kungFuDeathGripTimer = setTimeout(kungFuDeathGripResolve, timeoutMs);
           let retval = await Promise.race([func(), kungFuDeathGrip]);
           if (retval != kKungFuDeathGripTimeout) {
             clearTimeout(kungFuDeathGripTimer);

package/core/settings.js

@@ -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.5",
+  "version": "2.5.7",
   "description": "Web Application Testsuite",
   "type": "module",
   "engines": {

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

@@ -44,6 +44,13 @@ function getChromeOptions() {
   chromeOptions.addArguments('no-sandbox');
   chromeOptions.addArguments('disable-dev-shm-usage');
 
+  // Disable disk cache so stale resources from previous deploys are never
+  // served from cache.  Each test session fetches everything from the network.
+  chromeOptions.addArguments('disk-cache-size=0');
+
+  for (const arg of settings.webdriver_chrome_args || []) {
+    chromeOptions.addArguments(arg);
+  }
   return chromeOptions;
 }
 
@@ -577,15 +584,43 @@ class DriverBase {
       });
     `;
 
+    // Removes listeners and cleans up globals without waiting for a click
+    // event. Used when no_click_check is set and the click may not fire
+    // standard mouse events (e.g. range inputs on mobile Chrome).
+    let cleanupClick = `
+      const events = ['mousedown', 'mouseup', 'click', 'dblclick'];
+      for (let ev of events) {
+        window.document.removeEventListener(
+          ev, window.__selenium_clickHandler, true
+        );
+      }
+      delete window.__selenium_clickHandler;
+      delete window.__selenium_lastClick;
+      delete window.__selenium_clickElRect;
+      (arguments[arguments.length - 1])();
+    `;
+
     return this.waitForElementToInvoke(
       selector,
       el =>
         this.dvr
           .executeAsyncScript(listenClick, selector)
           .then(() => click_func(el))
-          .then(
-            () => !no_click_check && this.dvr.executeAsyncScript(checkClick),
-          )
+          .then(() => {
+            let p = this.dvr.executeAsyncScript(
+              no_click_check ? cleanupClick : checkClick,
+            );
+            if (no_click_check) {
+              // Page may navigate before cleanup script runs - that's OK.
+              p = p.catch(e => {
+                if (e instanceof error.ScriptTimeoutError) {
+                  return null;
+                }
+                throw e;
+              });
+            }
+            return p;
+          })
           .then(r => {
             if (!r) {
               if (!no_click_check) {