@camperaid/watest 2.4.5 → 2.4.7

package/core/base.js

@@ -567,6 +567,25 @@ function is_out(got, expected, msg) {
   return false;
 }
 
+function throws(func, exception, msg) {
+  try {
+    func();
+    fail(`${msg}: no '${exception}' exception`);
+  } catch (e) {
+    is(e?.message, exception, msg);
+  }
+}
+
+function no_throws(func, msg) {
+  try {
+    func();
+    success(msg);
+  } catch (e) {
+    log_error(e);
+    fail(`${msg}, got: ${e?.message ?? ''} exception`);
+  }
+}
+
 module.exports = {
   success,
   fail,
@@ -581,6 +600,9 @@ module.exports = {
   is_primitive,
   is_string,
 
+  throws,
+  no_throws,
+
   test_is,
   test_contains,
 

package/core/core.js

@@ -231,6 +231,7 @@ module.exports = {
   success(...args) {
     return currentCore.success(...args);
   },
+
   failed() {
     return currentCore.failed();
   },

package/index.js

@@ -17,6 +17,8 @@ const {
   is,
   contains,
   is_output,
+  no_throws,
+  throws,
 
   test_is,
   test_contains,
@@ -44,6 +46,7 @@ module.exports = {
   info,
   inspect,
   not_reached,
+  no_throws,
   ok,
   scope,
   start_session,
@@ -51,6 +54,7 @@ module.exports = {
   todo,
   test_is,
   test_contains,
+  throws,
   tmp_storage_dir,
   warn,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camperaid/watest",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "description": "Web Application Testsuite",
   "engines": {
     "node": ">=14.15.1"
@@ -38,12 +38,12 @@
     "selenium-webdriver": "^4.0.0-beta.2"
   },
   "devDependencies": {
-    "dotenv": "^8.2.0",
-    "eslint": "^7.15.0",
+    "dotenv": "^16.0.1",
+    "eslint": "^8.22.0",
     "eslint-plugin-node": "^11.1.0",
-    "husky": "^4.3.6",
-    "lint-staged": "^10.5.3",
-    "prettier": "2.2.1",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
     "prettifier": "^0.4.0"
   },
   "lint-staged": {

package/tests/base/t_throws.js

@@ -0,0 +1,75 @@
+'use strict';
+
+const { is_output, throws, no_throws } = require('./test.js');
+
+module.exports.test = async () => {
+  // throws: success
+  await is_output(
+    () =>
+      throws(
+        () => {
+          throw new Error('Error#1');
+        },
+        `Error#1`,
+        `Throws error#1`
+      ),
+    [`Ok: Throws error#1, got: Error#1`],
+    [],
+    `throws sucess`
+  );
+
+  // throws: fail, unexpected exception
+  await is_output(
+    () =>
+      throws(
+        () => {
+          throw new Error('Error#2');
+        },
+        `Error#1`,
+        `Wanted error#1`
+      ),
+    [],
+    [
+      `Failed: Wanted error#1;
+got:
+Error#2
+expected:
+Error#1
+unexpected character: '2' at 6 pos, expected: '1' at '' line
+`,
+    ],
+    `throws fail, unexpected exception`
+  );
+
+  // throws: fail, no exception
+  await is_output(
+    () => throws(() => {}, `Error#1`, `Wanted error#1`),
+    [],
+    [`Failed: Wanted error#1: no 'Error#1' exception`],
+    `throws fail, no exception`
+  );
+
+  // no_throws(() => {}, `No exceptions`)
+
+  // no_throws: success
+  await is_output(
+    () => no_throws(() => {}, `No exceptions`),
+    [`Ok: No exceptions`],
+    [],
+    `no throws: sucess`
+  );
+
+  // no_throws: fail
+  await is_output(
+    () =>
+      no_throws(() => {
+        throw new Error('Error#1');
+      }, `No exceptions`),
+    [],
+    [
+      v => v.startsWith('Error: Error#1'),
+      `Failed: No exceptions, got: Error#1 exception`,
+    ],
+    `no_throws fail`
+  );
+};

package/tests/series/logging/t_verify.js

@@ -8,6 +8,8 @@ const {
   success,
 } = require('../test.js');
 
+const { webdrivers } = require('../../../core/settings.js');
+
 const completed_in = name => got => got.startsWith(`>${name} completed in`);
 
 module.exports.test = async () => {
@@ -54,94 +56,112 @@ module.exports.test = async () => {
     LogPipe.restoreStdStreams();
   }
 
-  const buffers = LogPipe.FileStream.getLoggingBuffers();
-  is(
-    buffers,
-    [
-      ['log', ['Testsuite: shutdown', got => got.startsWith('Elapsed:')]],
-      [
-        'mac/log',
+  const chromeLogs = webdrivers.includes('chrome')
+    ? [
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/',
-          '\x1B[102mSuccess!\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/',
+          'mac/webdriver/chrome/log',
+          [
+            '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome',
+            '\x1B[102mmac/webdriver/chrome\x1B[0m Total: 1',
+            '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome',
+          ],
         ],
-      ],
-      [
-        'mac/webdriver/log',
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver',
-          '\x1B[102mmac/webdriver\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver',
+          'mac/webdriver/chrome/end-to-end/log',
+          [
+            '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome/end-to-end',
+            '\x1B[102mmac/webdriver/chrome/end-to-end\x1B[0m Total: 1',
+            '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome/end-to-end',
+          ],
         ],
-      ],
-      [
-        'mac/webdriver/chrome/log',
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome',
-          '\x1B[102mmac/webdriver/chrome\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome',
+          'mac/webdriver/chrome/end-to-end/history/log',
+          [
+            '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome/end-to-end/history',
+            '!Running: mac/webdriver/chrome/end-to-end/history/t_history.js, path: tests/webdriver/end-to-end/history/t_history.js',
+            '\x1B[31mFailed:\x1B[0m TestoFail',
+            '\x1B[31m>mac/webdriver/chrome/end-to-end/history/t_history.js\x1B[0m has 1 failure(s)',
+            completed_in(
+              'mac/webdriver/chrome/end-to-end/history/t_history.js'
+            ),
+            '\x1B[41m\x1B[37m>mac/webdriver/chrome/end-to-end/history/t_history.js\x1B[0m Failure count: 1',
+            '\x1B[41m\x1B[37mmac/webdriver/chrome/end-to-end/history > failed\x1B[0m Passed: 0. Failed: 1',
+            '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome/end-to-end/history',
+          ],
         ],
-      ],
-      [
-        'mac/webdriver/chrome/end-to-end/log',
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome/end-to-end',
-          '\x1B[102mmac/webdriver/chrome/end-to-end\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome/end-to-end',
+          'mac/webdriver/chrome/end-to-end/history2/log',
+          [
+            '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome/end-to-end/history2',
+            '!Running: mac/webdriver/chrome/end-to-end/history2/t_history.js, path: tests/webdriver/end-to-end/history/t_history.js',
+            '\x1B[32mOk:\x1B[0m TestoOk',
+            completed_in(
+              'mac/webdriver/chrome/end-to-end/history2/t_history.js'
+            ),
+            '\x1B[102mmac/webdriver/chrome/end-to-end/history2\x1B[0m Total: 1',
+            '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome/end-to-end/history2',
+          ],
         ],
-      ],
-      [
-        'mac/webdriver/chrome/end-to-end/history/log',
+      ]
+    : [];
+
+  const firefoxLogs = webdrivers.includes('firefox')
+    ? [
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome/end-to-end/history',
-          '!Running: mac/webdriver/chrome/end-to-end/history/t_history.js, path: tests/webdriver/end-to-end/history/t_history.js',
-          '\x1B[31mFailed:\x1B[0m TestoFail',
-          '\x1B[31m>mac/webdriver/chrome/end-to-end/history/t_history.js\x1B[0m has 1 failure(s)',
-          completed_in('mac/webdriver/chrome/end-to-end/history/t_history.js'),
-          '\x1B[41m\x1B[37m>mac/webdriver/chrome/end-to-end/history/t_history.js\x1B[0m Failure count: 1',
-          '\x1B[41m\x1B[37mmac/webdriver/chrome/end-to-end/history > failed\x1B[0m Passed: 0. Failed: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome/end-to-end/history',
+          'mac/webdriver/firefox/log',
+          [
+            '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/firefox',
+            '\x1B[102mmac/webdriver/firefox\x1B[0m Total: 1',
+            '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/firefox',
+          ],
         ],
-      ],
-      [
-        'mac/webdriver/firefox/log',
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/firefox',
-          '\x1B[102mmac/webdriver/firefox\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/firefox',
+          'mac/webdriver/firefox/end-to-end/log',
+          [
+            '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/firefox/end-to-end',
+            '\x1B[102mmac/webdriver/firefox/end-to-end\x1B[0m Total: 1',
+            '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/firefox/end-to-end',
+          ],
         ],
-      ],
-      [
-        'mac/webdriver/firefox/end-to-end/log',
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/firefox/end-to-end',
-          '\x1B[102mmac/webdriver/firefox/end-to-end\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/firefox/end-to-end',
+          'mac/webdriver/firefox/end-to-end/history/log',
+          [
+            '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/firefox/end-to-end/history',
+            '!Running: mac/webdriver/firefox/end-to-end/history/t_history.js, path: tests/webdriver/end-to-end/history/t_history.js',
+            '\x1B[32mOk:\x1B[0m TestoOk',
+            completed_in(
+              'mac/webdriver/firefox/end-to-end/history/t_history.js'
+            ),
+            '\x1B[102mmac/webdriver/firefox/end-to-end/history\x1B[0m Total: 1',
+            '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/firefox/end-to-end/history',
+          ],
         ],
-      ],
+      ]
+    : [];
+
+  const buffers = LogPipe.FileStream.getLoggingBuffers();
+  is(
+    buffers,
+    [
+      ['log', ['Testsuite: shutdown', got => got.startsWith('Elapsed:')]],
       [
-        'mac/webdriver/firefox/end-to-end/history/log',
+        'mac/log',
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/firefox/end-to-end/history',
-          '!Running: mac/webdriver/firefox/end-to-end/history/t_history.js, path: tests/webdriver/end-to-end/history/t_history.js',
-          '\x1B[32mOk:\x1B[0m TestoOk',
-          completed_in('mac/webdriver/firefox/end-to-end/history/t_history.js'),
-          '\x1B[102mmac/webdriver/firefox/end-to-end/history\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/firefox/end-to-end/history',
+          '\x1B[38;5;99mStarted\x1B[0m mac/',
+          '\x1B[102mSuccess!\x1B[0m Total: 1',
+          '\x1B[38;5;243mCompleted\x1B[0m mac/',
         ],
       ],
       [
-        'mac/webdriver/chrome/end-to-end/history2/log',
+        'mac/webdriver/log',
         [
-          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver/chrome/end-to-end/history2',
-          '!Running: mac/webdriver/chrome/end-to-end/history2/t_history.js, path: tests/webdriver/end-to-end/history/t_history.js',
-          '\x1B[32mOk:\x1B[0m TestoOk',
-          completed_in('mac/webdriver/chrome/end-to-end/history2/t_history.js'),
-          '\x1B[102mmac/webdriver/chrome/end-to-end/history2\x1B[0m Total: 1',
-          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver/chrome/end-to-end/history2',
+          '\x1B[38;5;99mStarted\x1B[0m mac/webdriver',
+          '\x1B[102mmac/webdriver\x1B[0m Total: 1',
+          '\x1B[38;5;243mCompleted\x1B[0m mac/webdriver',
         ],
       ],
+      ...chromeLogs,
+      ...firefoxLogs,
     ],
     'logging verify'
   );

package/tests/webdriver/t_app_driver.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { AppDriver, is_ok_output, do_self_tests } = require('./test.js');
+const { AppDriver, do_self_tests, is_ok_output } = require('./test.js');
 
 const snippet = `
 <html><body>
@@ -46,10 +46,12 @@ module.exports.test = do_self_tests(snippet, async session => {
         `Action: Get Input`,
         `Test: Input is shown. Selector: '#input'`,
         `Ok: '#input' has to be unique, got: 1`,
+        `[INFO] console-api 2:32 "[WatestAction] Get Input"`,
         `Ok: Input is shown`,
         `Action: Input.type 'hello' into Type hello`,
         `Test: Focus. Selector: '#input'`,
         `Ok: '#input' has to be unique, got: 1`,
+        `[INFO] console-api 2:32 "[WatestAction] Input.type 'hello' into Type hello"`,
         `Ok: Focus`,
         `Test: Focused. Selector: '#input'`,
         `Ok: '#input' has to be unique, got: 1`,

package/tests/webdriver/t_if_has_elements.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const { do_self_tests, is_ok_output } = require('./test.js');
+
+const snippet = `
+<html><body>
+  <input id='input' value='hey'>
+</body></html>
+`;
+
+module.exports.test = do_self_tests(snippet, async ({ driver }) => {
+  // ifHasElements: true path
+  await is_ok_output(
+    () =>
+      driver.ifHasElements(
+        '#input',
+        `ifHasElements true path`,
+        () => console.log(`Input doesn't exist`),
+        () => console.log(`Input unexpectedly exists`)
+      ),
+    [
+      `Test: ifHasElements true path. Selector: '#input'`,
+      `Input doesn't exist`,
+      `Ok: ifHasElements true path`,
+    ],
+    [],
+    `ifHasElements: true path`
+  );
+
+  // ifHasElements: false path
+  await is_ok_output(
+    () =>
+      driver.ifHasElements(
+        '#input-doesnot-exist',
+        `ifHasElements false path`,
+        () => console.log(`Input unexpectedly doesn't exist`),
+        () => console.log(`Input exists`)
+      ),
+    [
+      `Test: ifHasElements false path. Selector: '#input-doesnot-exist'`,
+      `Input exists`,
+      `Ok: ifHasElements false path`,
+    ],
+    [],
+    `ifHasElements: false path`
+  );
+});

package/tests/webdriver/t_if_no_elements.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const { do_self_tests, is_ok_output } = require('./test.js');
+
+const snippet = `
+<html><body>
+  <input id='input' value='hey'>
+</body></html>
+`;
+
+module.exports.test = do_self_tests(snippet, async ({ driver }) => {
+  // ifNoElements: true path
+  await is_ok_output(
+    () =>
+      driver.ifNoElements(
+        '#input-doesnot-exist',
+        `ifNoElements true path`,
+        () => console.log(`Input doesn't exist`),
+        () => console.log(`Input unexpectedly exists`)
+      ),
+    [
+      `Test: ifNoElements true path. Selector: '#input-doesnot-exist'`,
+      `Input doesn't exist`,
+      `Ok: ifNoElements true path`,
+    ],
+    [],
+    `ifNoElements: true path`
+  );
+
+  // ifNoElements: false path
+  await is_ok_output(
+    () =>
+      driver.ifNoElements(
+        '#input',
+        `ifNoElements false path`,
+        () => console.log(`Input unexpectedly doesn't exist`),
+        () => console.log(`Input exists`)
+      ),
+    [
+      `Test: ifNoElements false path. Selector: '#input'`,
+      `Input exists`,
+      `Ok: ifNoElements false path`,
+    ],
+    [],
+    `ifNoElements: false path`
+  );
+});

package/webdriver/app_driver.js

@@ -119,8 +119,16 @@ class AppDriver {
 
   execute(script, descr) {
     return this.chain(() =>
-      this.action(`${this.uiname}.execute ${descr}`)
-        .executeScript(script, `Execute script`)
+      this.action(`${this.uiname}.execute ${descr}`).executeScript(
+        script,
+        `Execute script`
+      )
+    );
+  }
+
+  screenshot(msg) {
+    return this.chain(() =>
+      this.action(`${this.uiname}.screenshot for ${msg}`).screenshot()
     );
   }
 

package/webdriver/driver.js

@@ -112,6 +112,15 @@ class Driver extends DriverBase {
     return this.chain(() => action());
   }
 
+  /**
+   * Logs a message into the web console.
+   */
+  logIntoConsole(message) {
+    return this.chain(() =>
+      this.dvr.executeScript(`console.log(arguments[0])`, message)
+    );
+  }
+
   /**
    * Sleeps for given amount of seconds.
    */
@@ -523,16 +532,6 @@ class Driver extends DriverBase {
     );
   }
 
-  /**
-   * Invokes a data request to the server on client.
-   */
-  invokeRequest(request) {
-    return this.executeScript(
-      `window.DataRequest.request(${JSON.stringify(request)})`,
-      `Invoke request: ${stringify(request)}`
-    );
-  }
-
   /**
    * Waits until script retval is matched an expected value.
    */
@@ -1082,6 +1081,30 @@ else {
           .then(tag => `Active element: ${tag}`)
     );
   }
+
+  ifHasElements(selector, msg, chain, else_chain) {
+    return this.run(
+      () =>
+        this.dvr
+          .findElements(By.css(selector))
+          .then(els => (els.length > 0 ? chain() : else_chain && else_chain())),
+      msg,
+      `Selector: '${selector}'`
+    );
+  }
+
+  ifNoElements(selector, msg, chain, else_chain) {
+    return this.run(
+      () =>
+        this.dvr
+          .findElements(By.css(selector))
+          .then(els =>
+            els.length == 0 ? chain() : else_chain && else_chain()
+          ),
+      msg,
+      `Selector: '${selector}'`
+    );
+  }
 }
 
 module.exports.Driver = Driver;

package/webdriver/driver_base.js

@@ -404,7 +404,7 @@ class DriverBase {
   }
 
   /**
-   * Waits for text to match a given condition for an element defined
+   * Waits for a match of a given condition for element(s) defined
    * by a selector.
    */
   matchBase({
@@ -566,7 +566,8 @@ class DriverBase {
 
     let checkClick = `
       console.log('[WD] Wait for lastClick promise resolved');
-      (window.__selenium_lastClick || Promise.resolve()).then(result => {
+      (Promise.resolve(window.__selenium_lastClick)).then(result => {
+        console.log('[WD] lastClick promise was resolved');
         delete window.__selenium_clickHandler;
         delete window.__selenium_lastClick;
         delete window.__selenium_clickElRect;

package/webdriver/session.js

@@ -123,7 +123,10 @@ async function start_session(arg1, arg2) {
   /**
    * Denotes a test action in console, a logical unit.
    */
-  s.action = msg => s.driver.invoke(() => group(msg, 'Action'), msg);
+  s.action = msg =>
+    s.driver
+      .invoke(() => group(msg, 'Action'), msg)
+      .logIntoConsole(`[WatestAction] ${msg}`);
 
   /**
    * Invokes a command.