Use NoSuchElementError when element not found in new Element API. (n…

…ightwatchjs#4193)
dikwickley · Oct 15, 2024 · 9f765ac · 9f765ac
1 parent 387d5be
commit 9f765ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/lib/api/web-element/scoped-element.js b/lib/api/web-element/scoped-element.js
@@ -340,9 +340,14 @@ class ScopedWebElement {
 }
 
 function createNarrowedError({error, condition, timeout}) {
-  return error.name === 'TimeoutError'
-    ? new Error(`Timed out while waiting for element "${condition}" to be present for ${timeout} milliseconds.`)
-    : error;
+  if (error.name === 'TimeoutError') {
+    const err = new Error(`Timed out while waiting for element "${condition}" to be present for ${timeout} milliseconds.`);
+    err.name = 'NoSuchElementError';
+
+    return err;
+  }
+
+  return error;
 }
 
 module.exports = ScopedWebElement;
diff --git a/lib/transport/errors/index.js b/lib/transport/errors/index.js
@@ -155,16 +155,13 @@ module.exports = {
     if (err && (err.name in SeleniumNightwatchErrorCodeMap)) {
       const statusCode = SeleniumNightwatchErrorCodeMap[err.name];
 
-      const error = {
-        ...err,
-        id: statusCode
-      };
-
       for (const [key, value] of Object.entries(Errors[statusCode])) {
-        error[key] ||= value;
+        err[key] ||= value;
       }
 
-      return error;
+      err.id = statusCode;
+
+      return err;
     } else if (err && err.name && (err.stack || err.stackTrace)){
       return err;
     }