summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/assert.js6
-rw-r--r--test/parallel/test-assert.js34
2 files changed, 24 insertions, 16 deletions
diff --git a/lib/assert.js b/lib/assert.js
index 0a505d553a..9c0e465ab8 100644
--- a/lib/assert.js
+++ b/lib/assert.js
@@ -485,7 +485,7 @@ function expectsError(stackStartFn, actual, error, message) {
);
}
message = error;
- error = null;
+ error = undefined;
}
if (actual === NO_EXCEPTION_SENTINEL) {
@@ -496,7 +496,7 @@ function expectsError(stackStartFn, actual, error, message) {
details += message ? `: ${message}` : '.';
const fnType = stackStartFn === rejects ? 'rejection' : 'exception';
innerFail({
- actual,
+ actual: undefined,
expected: error,
operator: stackStartFn.name,
message: `Missing expected ${fnType}${details}`,
@@ -514,7 +514,7 @@ function expectsNoError(stackStartFn, actual, error, message) {
if (typeof error === 'string') {
message = error;
- error = null;
+ error = undefined;
}
if (!error || expectedException(actual, error)) {
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
index c061551604..478945156e 100644
--- a/test/parallel/test-assert.js
+++ b/test/parallel/test-assert.js
@@ -192,32 +192,40 @@ a.throws(() => thrower(TypeError), (err) => {
const noop = () => {};
assert.throws(
() => { a.throws((noop)); },
- common.expectsError({
+ {
code: 'ERR_ASSERTION',
- message: /^Missing expected exception\.$/,
- operator: 'throws'
- }));
+ message: 'Missing expected exception.',
+ operator: 'throws',
+ actual: undefined,
+ expected: undefined
+ });
assert.throws(
() => { a.throws(noop, TypeError); },
- common.expectsError({
+ {
code: 'ERR_ASSERTION',
- message: /^Missing expected exception \(TypeError\)\.$/
- }));
+ message: 'Missing expected exception (TypeError).',
+ actual: undefined,
+ expected: TypeError
+ });
assert.throws(
() => { a.throws(noop, 'fhqwhgads'); },
- common.expectsError({
+ {
code: 'ERR_ASSERTION',
- message: /^Missing expected exception: fhqwhgads$/
- }));
+ message: 'Missing expected exception: fhqwhgads',
+ actual: undefined,
+ expected: undefined
+ });
assert.throws(
() => { a.throws(noop, TypeError, 'fhqwhgads'); },
- common.expectsError({
+ {
code: 'ERR_ASSERTION',
- message: /^Missing expected exception \(TypeError\): fhqwhgads$/
- }));
+ message: 'Missing expected exception (TypeError): fhqwhgads',
+ actual: undefined,
+ expected: TypeError
+ });
let threw = false;
try {