npm - @camperaid/watest - Versions diffs - 2.3.9 → 2.4.2 - Mend

@camperaid/watest 2.3.9 → 2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/core/base.js +5 -1
package/package.json +1 -1
package/tests/base/t_contains.js +1 -1
package/tests/webdriver/t_no_elements_or_not_visible.js +55 -0
package/tests/webdriver/t_script.js +1 -1
package/webdriver/driver.js +48 -10
package/webdriver/driver_base.js +1 -1

package/core/base.js CHANGED Viewed

@@ -123,7 +123,11 @@ function contains(
         })
       )
     ) {
-      fail_(`${msg}, array has no expected item ${stringify(e)}`);
+      fail_(
+        `${msg}, array has no expected item ${stringify(e)}, got: ${stringify(
+          got
+        )}`
+      );
       return false;
     }
   }

package/package.json CHANGED Viewed

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

package/tests/base/t_contains.js CHANGED Viewed

@@ -47,7 +47,7 @@ module.exports.test = async () => {
   await is_output(
     () => contains([0, 1], [1, 3], `Array contains`),
     [],
-    [`Failed: Array contains, array has no expected item 3`],
+    [`Failed: Array contains, array has no expected item 3, got: [0, 1]`],
     `failure`
   );
 };

package/tests/webdriver/t_no_elements_or_not_visible.js ADDED Viewed

@@ -0,0 +1,55 @@
+'use strict';
+const { do_self_tests, is_failure_output, is_ok_output } = require('./test.js');
+const snippet = `
+<html><body>
+  <input id='input-not-visible' hidden>
+  <input id='input-visible' value='hey'>
+</body></html>
+`;
+module.exports.test = do_self_tests(snippet, async ({ driver }) => {
+  // noElementsOrNotVisible: no elements: success
+  await is_ok_output(
+    () =>
+      driver.noElementsOrNotVisible(
+        '#input-doesnot-exist',
+        `noElementsOrNotVisible`
+      ),
+    [
+      `Test: noElementsOrNotVisible. Selector: '#input-doesnot-exist'`,
+      `Ok: noElementsOrNotVisible`,
+    ],
+    [],
+    `noElementsOrNotVisible:no elements: success`
+  );
+  // noElementsOrNotVisible: not visible: success
+  await is_ok_output(
+    () =>
+      driver.noElementsOrNotVisible(
+        '#input-not-visible',
+        `noElementsOrNotVisible`
+      ),
+    [
+      `Test: noElementsOrNotVisible. Selector: '#input-not-visible'`,
+      `Ok: noElementsOrNotVisible`,
+    ],
+    [],
+    `noElementsOrNotVisible:not visible:success`
+  );
+  // noElementsOrNotVisible: visible: failure
+  await is_failure_output(
+    driver,
+    () =>
+      driver.noElementsOrNotVisible('#input-visible', `noElementsOrNotVisible`),
+    [`Test: noElementsOrNotVisible. Selector: '#input-visible'`],
+    [
+      `Failed: noElementsOrNotVisible, timeout while waiting to meet criteria`,
+      `Failed: noElementsOrNotVisible. Failure details: Got elements count: 1, elements visibility [true], expected: not visible`,
+    ],
+    `noElementsOrNotVisible:visible:failure`
+  );
+});

package/tests/webdriver/t_script.js CHANGED Viewed

@@ -76,7 +76,7 @@ unexpected character: 'y' at 2 pos, expected: 'o' at '' line`,
       ),
     [`Test: scriptRetvalContains. Expected: ['heo']`],
     [
-      `Failed: script retval contains ['heo'], array has no expected item 'heo'`,
+      `Failed: script retval contains ['heo'], array has no expected item 'heo', got: ['hey', 'bo']`,
       `Failed: scriptRetvalContains, timeout while waiting to meet criteria`,
       `Failed: scriptRetvalContains`,
     ],

package/webdriver/driver.js CHANGED Viewed

@@ -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;
         }
       }
@@ -485,21 +486,25 @@ class Driver extends DriverBase {
    * Picks file(s) in a file input.
    */
   pickFile(selector, path, msg) {
-    assert(selector, `pickFile: no selector`);
-    assert(path, `pickFile: no path`);
-    assert(msg, `pickFile: no msg`);
-    return this.waitForElementToInvoke(selector, el => el.sendKeys(path), msg);
+    return this.pickFiles(selector, [path], msg);
   }
   pickFiles(selector, paths, msg) {
     assert(selector, `pickFiles: no selector`);
     assert(paths, `pickFiles: no paths`);
     assert(msg, `pickFiles: no msg`);
-    return this.waitForElementToInvoke(
-      selector,
-      el => el.sendKeys(paths.join('\n')),
-      msg
-    );
+    return this.chain(async () => {
+      // Clear previosly set value if any.
+      await this.setProperty(selector, 'value', '', msg);
+      // Send keys to upload files.
+      await this.waitForElementToInvoke(
+        selector,
+        el => el.sendKeys(paths.join('\n')),
+        msg
+      );
+    });
   }
   //
@@ -929,6 +934,39 @@ else {
     return this.elementsCount(selector, 0, msg);
   }
+  /**
+   * Waits until no elements in DOM or no elements is visible.
+   */
+  noElementsOrNotVisible(selector, msg) {
+    assert(selector, `noElementsOrNotVisible: no selector`);
+    assert(msg, `noElementsOrNotVisible: no msg`);
+    let breadcrumbs = '';
+    let cond = new Condition(`until no elements or not visible`, async () => {
+      let els = await this.dvr.findElements(By.css(selector));
+      breadcrumbs = `Got elements count: ${els.length}, expected 0`;
+      if (els.length == 0) {
+        return true;
+      }
+      let isDisplayedArray = await Promise.all(
+        Array.from(els).map(el => el.isDisplayed())
+      );
+      breadcrumbs = `Got elements count: ${
+        els.length
+      }, elements visibility [${isDisplayedArray.join(
+        ' ,'
+      )}], expected: not visible`;
+      return isDisplayedArray.every(isDisplayed => !isDisplayed);
+    });
+    return this.run(
+      () => this.waitForCondition(cond, () => breadcrumbs),
+      msg,
+      `Selector: '${selector}'`,
+      () => breadcrumbs
+    );
+  }
   /**
    * Waits until elements count is not zero.
    */

package/webdriver/driver_base.js CHANGED Viewed

@@ -686,7 +686,7 @@ class DriverBase {
           e instanceof error.ScriptTimeoutError
         ) {
           this.checkBreadcrumbs(get_breadcrumbs);
-          if (e.message.startsWith(`Waiting until meet criteria`)) {
+          if (e.message.startsWith(`Waiting until`)) {
             throw new CriteriaTimeoutError();
           }
         }