1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: check all properties in common.expectsError

Browse Source 
This makes sure all properties that are meant to be checked will
actually be tested for.

PR-URL: https://github.com/nodejs/node/pull/19722
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
Ruben Bridgewater 2018-04-01 10:15:37 +02:00 committed by Luigi Pinca
parent 2f8df6b0f2
commit 2fef227a61
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/common/index.js
View File

@ -691,7 +691,6 @@ exports.expectsError = function expectsError(fn, settings, exact) {
fn = undefined; fn = undefined;
} }
function innerFn(error) { function innerFn(error) {
assert.strictEqual(error.code, settings.code);
if ('type' in settings) { if ('type' in settings) {
const type = settings.type; const type = settings.type;
if (type !== Error && !Error.isPrototypeOf(type)) { if (type !== Error && !Error.isPrototypeOf(type)) {
@ -714,18 +713,16 @@ exports.expectsError = function expectsError(fn, settings, exact) {
`${error.message} does not match ${message}`); `${error.message} does not match ${message}`);
} }
} }
if ('name' in settings) {
assert.strictEqual(error.name, settings.name); // Check all error properties.
} const keys = Object.keys(settings);
if (error.constructor.name === 'AssertionError') { for (const key of keys) {
['generatedMessage', 'actual', 'expected', 'operator'].forEach((key) => { if (key === 'message' || key === 'type')
if (key in settings) { continue;
const actual = error[key]; const actual = error[key];
const expected = settings[key]; const expected = settings[key];
assert.strictEqual(actual, expected, assert.strictEqual(actual, expected,
`${key}: expected ${expected}, not ${actual}`); `${key}: expected ${expected}, not ${actual}`);
}
});
} }
return true; return true;
} }