assert: use isError instead of instanceof in innerOk

pmarchini · BridgeAR · NiharPhansalkar · RafaelGSS · commit 063f46dc2a36 · 2024-08-05T11:15:46.000-03:00
Co-Authored-By: Ruben Bridgewater <ruben@bridgewater.de> Co-Authored-By: Nihar Phansalkar <phansalkarnihar@gmail.com> PR-URL: #53980 Fixes: #50780 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
diff --git a/lib/assert.js b/lib/assert.js
@@ -393,7 +393,7 @@ function innerOk(fn, argLen, value, message) {
     } else if (message == null) {
       generatedMessage = true;
       message = getErrMessage(message, fn);
-    } else if (message instanceof Error) {
+    } else if (isError(message)) {
       throw message;
     }
 
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -55,6 +55,16 @@ assert.throws(() => a.ok(false), a.AssertionError, 'ok(false)');
   assert.ok(threw, 'Error: ok(false)');
 }
 
+// Errors created in different contexts are handled as any other custom error
+{
+  const context = vm.createContext();
+  const error = vm.runInContext('new SyntaxError("custom error")', context);
+
+  assert.throws(() => assert(false, error), {
+    message: 'custom error',
+    name: 'SyntaxError'
+  });
+}
 
 a(true);
 a('test', 'ok(\'test\')');

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ function innerOk(fn, argLen, value, message) {`
`393`	`393`	`} else if (message == null) {`
`394`	`394`	`generatedMessage = true;`
`395`	`395`	`message = getErrMessage(message, fn);`
`396`		`- } else if (message instanceof Error) {`
	`396`	`+ } else if (isError(message)) {`
`397`	`397`	`throw message;`
`398`	`398`	`}`
`399`	`399`