@camperaid/watest 2.5.6 → 2.5.7

package/package.json

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

package/webdriver/driver-base.js

@@ -44,6 +44,10 @@ 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);
   }
@@ -580,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) {