fix: assertion failure in new Elem API leads to unhandledRejection. (#…

…4277)
nightwatchjs · Oct 21, 2024 · a3f3181 · a3f3181
1 parent 785d52a
commit a3f3181
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 8 deletions.
diff --git a/lib/api/web-element/assert/element-assertions.js b/lib/api/web-element/assert/element-assertions.js
@@ -7,12 +7,29 @@ class ScopedElementAssertions {
     this.nightwatchInstance = nightwatchInstance;
   }
 
-  async assert(callback) {
-    const assert = this.nightwatchInstance.api.assert;
+  assert(callback) {
+    const assertPromise = new Promise((resolve, reject) => {
+      const assert = this.nightwatchInstance.api.assert;
 
-    await callback(this.negated ? assert.not : assert, this.scopedElement.webElement);
+      const callbackResult = callback(this.negated ? assert.not : assert, this.scopedElement.webElement);
+      if (callbackResult instanceof Promise) {
+        callbackResult
+          .then(() => {
+            resolve(this.scopedElement);
+          })
+          .catch(err => {
+            reject(err);
+          });
+      } else {
+        resolve(this.scopedElement);
+      }
+    });
 
-    return this.scopedElement;
+    // prevent unhandledRejection errors, while also making sure
+    // that the exception passes to the actual test case.
+    assertPromise.catch(() => {});
+
+    return assertPromise;
   }
 
   async executeScript(scriptFn, args) {

diff --git a/lib/api/web-element/assert/value-assertions.js b/lib/api/web-element/assert/value-assertions.js
@@ -8,11 +8,28 @@ module.exports.create = function createAssertions(scopedValue, {negated, nightwa
       this.scopedValue = scopedValue;
     }
 
-    async _assert(callback) {
-      const assert = nightwatchInstance.api.assert;
-      await callback(this.negated ? assert.not : assert, this.scopedValue.value);
+    _assert(callback) {
+      const assertPromise = new Promise((resolve, reject) => {
+        const assert = nightwatchInstance.api.assert;
+        const callbackResult = callback(this.negated ? assert.not : assert, this.scopedValue.value);
+        if (callbackResult instanceof Promise) {
+          callbackResult
+            .then(() => {
+              resolve(this.scopedValue);
+            })
+            .catch(err => {
+              reject(err);
+            });
+        } else {
+          resolve(this.scopedValue);
+        }
+      });
+
+      // prevent unhandledRejection errors, while also making sure
+      // that the exception passes to the actual test case.
+      assertPromise.catch((err) => {});
 
-      return this.scopedValue;
+      return assertPromise;
     }
 
     get not() {