Skip to content

Commit

Permalink
assert: use isError instead of instanceof in innerOk
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
3 people authored and RafaelGSS committed Aug 5, 2024
1 parent 68e444d commit 063f46d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
10 changes: 10 additions & 0 deletions test/parallel/test-assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -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\')');
Expand Down

0 comments on commit 063f46d

Please sign in to comment.