@camperaid/watest 2.3.7 → 2.4.0

package/tests/series/build/t_loader_mixed.js

@@ -54,7 +54,7 @@ module.exports.test = async () => {
       {
         name: 'mac/ui',
         path: 'tests/ui/',
-        loader: '/Users/me/projects/camperaid/watest/tests/ui/meta.mjs',
+        loader: v => v.endsWith('tests/ui/meta.mjs'),
         webdriver: '',
         run_in_child_process: true,
       },

package/webdriver/app_driver.js

@@ -108,7 +108,7 @@ class AppDriver {
 
   uncheck(selector, field) {
     return this.chain(() =>
-      this.action(`${this.constructor.name}.uncheck ${field}`)
+      this.action(`${this.uiname}.uncheck ${field}`)
         .click(selector, `Click at ${field}`)
         .hasElements(
           `${selector}:not(:checked)`,
@@ -117,6 +117,13 @@ class AppDriver {
     );
   }
 
+  execute(script, descr) {
+    return this.chain(() =>
+      this.action(`${this.uiname}.execute ${descr}`)
+        .executeScript(script, `Execute script`)
+    );
+  }
+
   // Returns a name for the tested class. Typically the name convension for
   // UI drivers is a test class name postixed by Driver.
   get uiname() {

package/webdriver/driver.js

@@ -34,7 +34,8 @@ class Driver extends DriverBase {
           url = url_or_snippet;
         }
       } catch (e) {
-        if (e.code != 'ERR_INVALID_URL') {
+        // Non standard Error.code may not be set to 'ERR_INVALID_URL'.
+        if (!(e instanceof TypeError) || !e.message.startsWith('Invalid URL')) {
           throw e;
         }
       }
@@ -169,13 +170,47 @@ class Driver extends DriverBase {
     );
   }
 
+  /**
+   * Waits untils an element defined by a selector has attribute.
+   */
+  hasAttribute(selector, attr, msg) {
+    assert(selector, `hasAttribute: no selector`);
+    assert(attr, `hasAttribute: no attr`);
+    assert(msg, `hasAttribute: no msg`);
+
+    return this.matchAttribute({
+      selector,
+      attr,
+      msg,
+      test: got => got !== null,
+      expected_stringified: stringify(null),
+    });
+  }
+
+  /**
+   * Waits untils an element defined by a selector has no attribute.
+   */
+  noAttribute(selector, attr, msg) {
+    assert(selector, `noAttribute: no selector`);
+    assert(attr, `noAttribute: no attr`);
+    assert(msg, `noAttribute: no msg`);
+
+    return this.matchAttribute({
+      selector,
+      attr,
+      msg,
+      test: got => got === null,
+      expected_stringified: stringify(null),
+    });
+  }
+
   /**
    * Waits untils an element defined by a selector has attribute of a given value.
    */
   attributeIs(selector, attr, value, msg) {
     assert(selector, `attributeIs: no selector`);
     assert(attr, `attributeIs: no attr`);
-    assert(value != undefined, `attributeIs: no value`);
+    assert(value !== undefined, `attributeIs: no value`);
     assert(msg, `attributeIs: no msg`);
 
     return this.matchAttribute({

package/webdriver/driver_base.js

@@ -65,6 +65,26 @@ function warn_if_stale(e, msg) {
 
 class TestExecutionError extends Error {}
 
+class CriteriaTimeoutError extends Error {
+  constructor() {
+    super(`timeout while waiting to meet criteria`);
+  }
+}
+
+class NoElementsError extends Error {
+  constructor(selector) {
+    super(`no elements matching '${selector}' selector`);
+  }
+}
+
+class UnexpectedElementCountError extends Error {
+  constructor(selector, gotCount, expectedCount) {
+    super(
+      `ambigious '${selector}' selector, got ${gotCount} elements, expected ${expectedCount}`
+    );
+  }
+}
+
 /**
  * A chainable wrapper around selenium web driver, provides barebone methods
  * to build webdrivers upon.
@@ -424,15 +444,17 @@ class DriverBase {
                   'Waiting for at least one element to be located'
                 )
               ) {
-                throw new Error(`no elements matching '${selector}' selector`);
+                throw new NoElementsError(selector);
               }
             }
             throw e;
           })
           .then(els => {
             if (els.length > count) {
-              throw new Error(
-                `ambigious '${selector}' selector, got ${els.length} elements, expected ${count}`
+              throw new UnexpectedElementCountError(
+                selector,
+                els.length,
+                count
               );
             }
             return els;
@@ -665,7 +687,7 @@ class DriverBase {
         ) {
           this.checkBreadcrumbs(get_breadcrumbs);
           if (e.message.startsWith(`Waiting until meet criteria`)) {
-            throw new Error(`timeout while waiting to meet criteria`);
+            throw new CriteriaTimeoutError();
           }
         }
         throw e;
@@ -803,9 +825,7 @@ class DriverBase {
 
     return this.chain(() =>
       Promise.resolve()
-        .then(() =>
-          log(`Test: ${msg}${(details && `. ${details}`) || ''}`)
-        )
+        .then(() => log(`Test: ${msg}${(details && `. ${details}`) || ''}`))
         .then(() => chain())
         .then(v => this.browserLogs().then(() => v))
         .then(v => {
@@ -830,6 +850,13 @@ class DriverBase {
                 }`;
               }
               report(`${msg}${fdetails}`);
+              if (
+                !(e instanceof CriteriaTimeoutError) &&
+                !(e instanceof NoElementsError) &&
+                !(e instanceof UnexpectedElementCountError)
+              ) {
+                log_error(e);
+              }
             })
             .then(() => this.captureScreenshot())
             .catch(e => {