@camperaid/watest 2.4.1 → 2.4.4

package/.watestrc.js

@@ -53,6 +53,12 @@ const cfg = {
    * Servicer module.
    */
   servicer: process.env.WATEST_SERVICER_MODULE,
+
+  /**
+   * Regular expression defining a file name pattern
+   * to exclude from the tests.
+   */
+  ignore_pattern: process.env.WATEST_IGNORE_PATTERN,
 };
 
 module.exports = cfg;

package/core/base.js

@@ -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/core/series.js

@@ -30,6 +30,9 @@ const {
 const root_folder = 'tests';
 const root_dir = path.resolve('.');
 
+const kKungFuDeathGripTimeout = {};
+const kKungFuDeathGripCancelled = {};
+
 process.on('unhandledRejection', error => {
   log_error(error);
   fail(`Unhandled Promise rejection`);
@@ -635,26 +638,41 @@ class Series {
       // Invoke a test.
       log(`\n!Running: ${name}, path: ${path}\n`);
       let start_time = new Date();
+      let kungFuDeathGrip = null;
+      let kungFuDeathGripResolve = null;
+      let kungFuDeathGripTimer = 0;
       try {
         this.core.setExpectedFailures(failures_info);
 
         // 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.`
-            )
+          kungFuDeathGrip = new Promise(
+            resolve => (kungFuDeathGripResolve = resolve)
+          ).then(value => {
+            if (value != kKungFuDeathGripCancelled) {
+              fail(
+                `Test ${name} takes longer than ${settings.timeout}ms. It's either slow or never ends.`
+              );
+              return kKungFuDeathGripTimeout;
+            }
+          });
+          kungFuDeathGripTimer = setTimeout(
+            kungFuDeathGripResolve,
+            settings.timeout
           );
-
-          await Promise.race([func(), kungFuDeathGrip]);
-          clearTimeout(kungFuDeathGripTimer);
+          let retval = await Promise.race([func(), kungFuDeathGrip]);
+          if (retval != kKungFuDeathGripTimeout) {
+            clearTimeout(kungFuDeathGripTimer);
+            kungFuDeathGripResolve(kKungFuDeathGripCancelled);
+          }
         } else {
           await func(); // execute the test
         }
       } catch (e) {
+        if (kungFuDeathGripTimer) {
+          clearTimeout(kungFuDeathGripTimer);
+          kungFuDeathGripResolve(kKungFuDeathGripCancelled);
+        }
         let failmsg = e;
         if (e instanceof Error) {
           log_error(e);
@@ -878,7 +896,11 @@ class Series {
   getTestFileList(folder) {
     return fs
       .readdirSync(path.join(root_dir, folder))
-      .filter(n => n.startsWith('t_'));
+      .filter(
+        n =>
+          n.startsWith('t_') &&
+          (!settings.ignorePattern || !settings.ignorePattern.test(n))
+      );
   }
 
   performInChildProcess({ name, path, loader, webdriver }) {

package/core/settings.js

@@ -46,6 +46,10 @@ class Settings {
     return this._invocation;
   }
 
+  get ignorePattern() {
+    return rc.ignore_pattern && new RegExp(rc.ignore_pattern);
+  }
+
   get debunkLimit() {
     return parseInt(rc.debunk_limit) || 5;
   }

package/package.json

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

package/tests/base/t_contains.js

@@ -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_script.js

@@ -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`,
     ],