@camperaid/watest 2.5.6 → 2.5.8

package/core/series.js

@@ -61,8 +61,8 @@ class Series {
           )
           .then(
             () => series.shutdown(),
-            e => {
-              let failures = series.shutdown();
+            async e => {
+              let failures = await series.shutdown();
               fail(e.message);
               log_error(e);
               return failures;
@@ -191,8 +191,8 @@ class Series {
     await this.perform({ folder: `${this.invocation}/`, tests });
   }
 
-  shutdown() {
-    this.shutdownServicer();
+  async shutdown() {
+    await this.shutdownServicer();
     testflow.unlock();
 
     console.log(`Testsuite: shutdown`);
@@ -1101,9 +1101,9 @@ class Series {
     return settings.getServicer(servicerType);
   }
 
-  shutdownServicer() {
+  async shutdownServicer() {
     if (this.#servicer) {
-      this.#servicer.shutdown();
+      await this.#servicer.shutdown();
       this.#servicer = null;
     }
   }

package/package.json

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

package/tests/series/build/t-adjust-names-webdriver.js

@@ -39,7 +39,7 @@ export async function test() {
     virtual_folder: 'mac',
   });
   series.adjustTestNames(tests, '2');
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-adjust-names.js

@@ -38,7 +38,7 @@ export async function test() {
     virtual_folder: 'unit',
   });
   series.adjustTestNames(tests, '2');
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-expected-failures.js

@@ -59,7 +59,7 @@ export async function test() {
     folder: 'unit',
     virtual_folder: 'unit',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-loader-mixed.js

@@ -31,7 +31,7 @@ export async function test() {
     folder: 'tests',
     virtual_folder: 'mac',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-loader.js

@@ -33,7 +33,7 @@ export async function test() {
     folder: 'tests',
     virtual_folder: 'mac',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-mixed.js

@@ -43,7 +43,7 @@ export async function test() {
     folder: 'tests',
     virtual_folder: 'mac',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

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

@@ -37,7 +37,7 @@ export async function test() {
     folder: 'unit',
     virtual_folder: 'unit',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-pattern-filtering.js

@@ -70,7 +70,7 @@ export async function test() {
     folder: 'tests',
     virtual_folder: 'mac',
   });
-  series.shutdown();
+  await series.shutdown();
 
   // Should only build the unit folder and its relevant subfolders
   // Should NOT build integration or e2e folders

package/tests/series/build/t-patterns-loader.js

@@ -42,7 +42,7 @@ export async function test() {
     folder: 'tests',
     virtual_folder: 'mac',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-patterns-webdriver.js

@@ -28,7 +28,7 @@ export async function test() {
     folder: 'e2e',
     virtual_folder: 'e2e',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-rerun-suffix.js

@@ -29,7 +29,7 @@ export async function test() {
     virtual_folder: 'linux/www',
   });
   series.applyRerunSuffix(tests, '5');
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-webdriver-firefox-mixed.js

@@ -31,7 +31,7 @@ export async function test() {
     folder: 'tests',
     virtual_folder: 'myrun',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-webdriver-nested.js

@@ -23,7 +23,7 @@ export async function test() {
     folder: 'e2e',
     virtual_folder: 'e2e',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-webdriver-services.js

@@ -27,7 +27,7 @@ export async function test() {
     folder: 'e2e',
     virtual_folder: 'e2e',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

package/tests/series/build/t-webdriver.js

@@ -30,7 +30,7 @@ export async function test() {
     folder: 'e2e',
     virtual_folder: 'e2e',
   });
-  series.shutdown();
+  await series.shutdown();
 
   is(
     tests,

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

@@ -22,7 +22,7 @@ function make_perform_with_timeout(tests) {
     try {
       await series.perform({ folder: 'tests/', tests });
     } finally {
-      series.shutdown();
+      await series.shutdown();
     }
   };
 }

package/tests/series/test.js

@@ -71,7 +71,7 @@ export function make_perform_function(tests) {
     try {
       await series.perform({ folder: 'tests/', tests: build_tests(tests) });
     } finally {
-      series.shutdown();
+      await series.shutdown();
     }
   };
 }

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