@camperaid/watest 2.3.4 → 2.3.8

package/.watestrc.js

@@ -18,6 +18,11 @@ const cfg = {
    */
   log_dir: process.env.WATEST_LOG_DIR,
 
+  /**
+   * If a test takes longer than the given number, the test will fail.
+   */
+  timeout: process.env.WATEST_TIMEOUT,
+
   /**
    * Temporary storage dir. Recreated each test run. Shall be used to store
    * files generated by tests if any.

package/core/base.js

@@ -324,6 +324,17 @@ function is_object_impl(
     return false;
   }
 
+  // Date
+  if (got instanceof Date) {
+    if (got.valueOf() == expected.valueOf()) {
+      return true;
+    }
+    let got_str = stringify(got);
+    let expected_str = `expected: ${stringify(expected)}`;
+    fail_(`${contextmsg} unexpected value: ${got_str}, ${expected_str}`);
+    return false;
+  }
+
   // Convert Set and Map to Arrays.
   if (got instanceof Set) {
     got = Array.from(got.values());
@@ -537,9 +548,7 @@ function is_out(got, expected, msg) {
 
     let min = Math.min(got_i.length, exp_i.length);
     for (let j = 0; j < min; j++) {
-      log_error(
-        `${j}\t'${got_i[j]}'\t'${exp_i[j]}'\t${exp_i[j] == got_i[j]}`
-      );
+      log_error(`${j}\t'${got_i[j]}'\t'${exp_i[j]}'\t${exp_i[j] == got_i[j]}`);
     }
 
     for (let j = min; j < got_i.length; j++) {

package/core/core.js

@@ -57,11 +57,16 @@ class Core {
   }
 
   fail(msg) {
-    const m = msg;
+    if (typeof msg == 'object') {
+      inspect(msg);
+      this.unconditional_fail('Unexpected exception');
+      return;
+    }
+
     for (let v of this.expectedFailures) {
       if (v.group == '*' || v.group == this.currgroup) {
         let f = v.list.find(f => f[1] == 0 || f[0] == '*');
-        if (f && (f[0] == '*' || m.includes(f[0]))) {
+        if (f && (f[0] == '*' || msg.includes(f[0]))) {
           f[1]++;
           this.warn(msg);
 
@@ -78,11 +83,6 @@ class Core {
       }
     }
 
-    if (typeof msg == 'object') {
-      inspect(msg);
-      msg = 'Unexpected exception';
-    }
-
     this.unconditional_fail(msg);
   }
 

package/core/series.js

@@ -637,7 +637,23 @@ class Series {
       let start_time = new Date();
       try {
         this.core.setExpectedFailures(failures_info);
-        await func(); // execute the test
+
+        // If timeout is given then race it against the test.
+        if (settings.timeout) {
+          let kungFuDeathGripTimer = 0;
+          let kungFuDeathGrip = new Promise(r => {
+            kungFuDeathGripTimer = setTimeout(r, settings.timeout);
+          }).then(() =>
+            fail(
+              `Test ${name} takes longer than ${settings.timeout}ms. It's either slow or never ends.`
+            )
+          );
+
+          await Promise.race([func(), kungFuDeathGrip]);
+          clearTimeout(kungFuDeathGripTimer);
+        } else {
+          await func(); // execute the test
+        }
       } catch (e) {
         let failmsg = e;
         if (e instanceof Error) {

package/core/settings.js

@@ -50,6 +50,10 @@ class Settings {
     return parseInt(rc.debunk_limit) || 5;
   }
 
+  get timeout() {
+    return parseInt(rc.timeout) || 0;
+  }
+
   setupTmpStorageDir() {
     if (!rc.tmp_dir) {
       console.log(`Settings: no temporary storage dir`);

package/core/util.js

@@ -8,9 +8,7 @@ const cfg = require('./settings.js');
  * Logs object in console colored.
  */
 function inspect(obj) {
-  log(
-    require('util').inspect(obj, false, null, true /* enable colors */)
-  );
+  log(require('util').inspect(obj, false, null, true /* enable colors */));
 }
 
 /**
@@ -31,6 +29,9 @@ function stringify(obj, traces = new Set()) {
   if (obj instanceof Array) {
     return `[${obj.map(i => stringify(i, traces)).join(', ')}]`;
   }
+  if (obj instanceof Date) {
+    return obj.toISOString();
+  }
   if (obj instanceof Set) {
     let values = Array.from(obj.values());
     return `Set[${values.map(i => stringify(i, traces)).join(', ')}]`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camperaid/watest",
-  "version": "2.3.4",
+  "version": "2.3.8",
   "description": "Web Application Testsuite",
   "engines": {
     "node": ">=14.15.1"

package/tests/base/t_is_object.js

@@ -27,6 +27,25 @@ module.exports.test = async () => {
     `types: Map`
   );
 
+  // types: Date success
+  await is_output(
+    () => is_object(new Date('2022-01-01'), new Date('2022-01-01'), 'TstMsg'),
+    [`Ok: TstMsg, got: 2022-01-01T00:00:00.000Z`],
+    [],
+    `types: Date sucess`
+  );
+
+  // types: Date failure
+  await is_output(
+    () => is_object(new Date('2022-01-01'), new Date('2023-02-02'), 'TstMsg'),
+    [],
+    [
+      `Failed: TstMsg: unexpected value: 2022-01-01T00:00:00.000Z, expected: 2023-02-02T00:00:00.000Z`,
+      `Failed: TstMsg`,
+    ],
+    `types: Date failure`
+  );
+
   // function sucess
   await is_output(
     () => is_object({ field: 'hey' }, () => true, 'TstMsg'),

package/tests/base/t_stringify.js

@@ -21,6 +21,7 @@ module.exports.test = () => {
   is(stringify(new Set(['v1', 'v2'])), `Set['v1', 'v2']`, 'set');
   is(stringify(new Map([['key', 'value']])), `Map{key: 'value'}`, 'map');
   is(stringify(/\d+/), `/\\d+/`, 'regexp');
+  is(stringify(new Date('2022-01-01')), '2022-01-01T00:00:00.000Z', `Date`);
 
   // functions
   is(

package/tests/e2e/samples/folder/node_modules/.package-lock.json

@@ -6,7 +6,7 @@
   "packages": {
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/folder/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/loader/node_modules/.package-lock.json

@@ -6,7 +6,7 @@
   "packages": {
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/loader/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/loader_mixed/node_modules/.package-lock.json

@@ -6,7 +6,7 @@
   "packages": {
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/loader_mixed/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/loader_multiple/node_modules/.package-lock.json

@@ -6,7 +6,7 @@
   "packages": {
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/loader_multiple/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/single/node_modules/.package-lock.json

@@ -6,7 +6,7 @@
   "packages": {
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/single/package-lock.json

@@ -13,7 +13,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/wd_mixed/node_modules/.package-lock.json

@@ -6,7 +6,7 @@
   "packages": {
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/wd_mixed/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/wd_single/node_modules/.package-lock.json

@@ -6,7 +6,7 @@
   "packages": {
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/e2e/samples/wd_single/package-lock.json

@@ -16,7 +16,7 @@
     },
     "../../../..": {
       "name": "@camperaid/watest",
-      "version": "2.3.4",
+      "version": "2.3.8",
       "dev": true,
       "license": "MPL",
       "dependencies": {

package/tests/webdriver/t_app_driver.js

@@ -25,7 +25,7 @@ module.exports.test = do_self_tests(snippet, async session => {
         `Test: Input is shown. Selector: '#input'`,
         `Ok: '#input' has to be unique, got: 1`,
         `Ok: Input is shown`,
-        `Action: Input.type into Type hello`,
+        `Action: Input.type 'hello' into Type hello`,
         `Test: Focus. Selector: '#input'`,
         `Ok: '#input' has to be unique, got: 1`,
         `Ok: Focus`,
@@ -47,7 +47,7 @@ module.exports.test = do_self_tests(snippet, async session => {
         `Test: Input is shown. Selector: '#input'`,
         `Ok: '#input' has to be unique, got: 1`,
         `Ok: Input is shown`,
-        `Action: Input.type into Type hello`,
+        `Action: Input.type 'hello' into Type hello`,
         `Test: Focus. Selector: '#input'`,
         `Ok: '#input' has to be unique, got: 1`,
         `Ok: Focus`,

package/webdriver/app_driver.js

@@ -73,7 +73,7 @@ class AppDriver {
 
   type(selector, value, field) {
     return this.chain(() =>
-      this.action(`${this.uiname}.type into ${field}`)
+      this.action(`${this.uiname}.type '${value}' into ${field}`)
         .sendKeys(selector, '', `Focus`)
         .elementFocused(selector, 'Focused')
         .selectAll(selector, `Select all text`)
@@ -82,6 +82,14 @@ class AppDriver {
     );
   }
 
+  clear(selector, field) {
+    return this.chain(() =>
+      this.action(`${this.uiname}.clear ${field}`)
+        .clear(selector, `Clear text`)
+        .textIs(selector, '', `Check ${field} text`)
+    );
+  }
+
   setValue(selector, value, field) {
     return this.chain(() =>
       this.action(`${this.uiname}.setValue for ${field}`)
@@ -100,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)`,
@@ -109,10 +117,19 @@ 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() {
-    return this.constructor.name.replace(/Driver$/, '');
+    let o = this;
+    while ((o = Object.getPrototypeOf(o)) && o.constructor.name == '');
+    return o.constructor.name.replace(/Driver$/, '');
   }
 
   defineSelectors(context, selectors) {

package/webdriver/driver.js

@@ -169,13 +169,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({
@@ -187,6 +221,29 @@ class Driver extends DriverBase {
     });
   }
 
+  /**
+   * Waits untils an element defined by a selector has attribute of a given value.
+   */
+  attributeIsAll(selector, attr, values, msg) {
+    assert(selector, `attributeIsAll: no selector`);
+    assert(attr, `attributeIsAll: no attr`);
+    assert(values, `attributeIsAll: no values`);
+    assert(msg, `attributeIsAll: no msg`);
+
+    return this.matchAttributeAll({
+      selector,
+      attr,
+      values,
+      msg,
+      test: got =>
+        test_is(
+          got,
+          values.map(value => got => got == value)
+        ),
+      expected_stringified: stringify(values),
+    });
+  }
+
   /**
    * Waits untils an element defined by a selector has attribute of a given value.
    */
@@ -800,10 +857,14 @@ else {
   window.getSelection().addRange(r);
 }
 `;
-    return this.run(() => this.dvr.executeScript(script).catch(e => {
-      fail(`Failed to execute selectAll script: ${script}`);
-      throw e;
-    }), msg);
+    return this.run(
+      () =>
+        this.dvr.executeScript(script).catch(e => {
+          fail(`Failed to execute selectAll script: ${script}`);
+          throw e;
+        }),
+      msg
+    );
   }
 
   /**