Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib: added isNativeError check to assert.js #51250

Closed
wants to merge 3 commits into from
Closed

lib: added isNativeError check to assert.js #51250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a84499f
lib: added isNativeError check to assert.js
NiharPhansalkar Dec 21, 2023
cf550eb
test: added test for assert.ok() changes
NiharPhansalkar Dec 24, 2023
1de2680
test, lib: revised tests and shortened assert code
NiharPhansalkar Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/assert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const {
validateFunction,
} = require('internal/validators');
const { fileURLToPath } = require('internal/url');
const { isNativeError } = internalBinding('types');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const { isNativeError } = internalBinding('types');


let isDeepEqual;
let isDeepStrictEqual;
Expand Down Expand Up @@ -393,7 +394,7 @@ function innerOk(fn, argLen, value, message) {
} else if (message == null) {
generatedMessage = true;
message = getErrMessage(message, fn);
} else if (message instanceof Error) {
} else if (isNativeError(message) || message instanceof Error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
} else if (isNativeError(message) || message instanceof Error) {
} else if (isError(message)) {

throw message;
}

Expand Down
23 changes: 22 additions & 1 deletion test/parallel/test-assert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const start = 'Expected values to be strictly deep-equal:';
const actExp = '+ actual - expected';

assert.ok(a.AssertionError.prototype instanceof Error,
'a.AssertionError instanceof Error');
'a.AssertionError instanceof Error');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'a.AssertionError instanceof Error');
'a.AssertionError instanceof Error');


assert.throws(() => a(false), a.AssertionError, 'ok(false)');
assert.throws(() => a.ok(false), a.AssertionError, 'ok(false)');
Expand All @@ -55,6 +55,27 @@ assert.throws(() => a.ok(false), a.AssertionError, 'ok(false)');
assert.ok(threw, 'Error: ok(false)');
}

// Thrown error should be the passed through error instance of the native error
{
const context = vm.createContext();
const error = vm.runInContext('new TypeError("custom error")', context);

assert.throws(() => assert(false, error), {
message: 'custom error',
name: 'TypeError'
});
}

Comment on lines +58 to +68
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Thrown error should be the passed through error instance of the native error
{
const context = vm.createContext();
const error = vm.runInContext('new TypeError("custom error")', context);
assert.throws(() => assert(false, error), {
message: 'custom error',
name: 'TypeError'
});
}

// Thrown error should be the passed through error instance of the native error
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Thrown error should be the passed through error instance of the native error
// 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