Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ function _throws(shouldThrow, block, expected, message) {

actual = _tryBlock(block);

message = (expected && expected.name ? ' (' + expected.name + ').' : '.') +
(message ? ' ' + message : '.');
message = (expected && expected.name ? ' (' + expected.name + ')' : '') +
(message ? ': ' + message : '.');

if (shouldThrow && !actual) {
fail(actual, expected, 'Missing expected exception' + message);
Expand Down
25 changes: 24 additions & 1 deletion test/parallel/test-assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,29 @@ a.throws(makeBlock(a.deepEqual, args, []));
a.doesNotThrow(makeBlock(a.deepEqual, someArgs, sameArgs));
}

// check messages from assert.throws()
{
assert.throws(
() => { a.throws(() => {}); },
/^AssertionError: Missing expected exception\.$/
);

assert.throws(
() => { a.throws(() => {}, TypeError); },
/^AssertionError: Missing expected exception \(TypeError\)\.$/
);

assert.throws(
() => { a.throws(() => {}, 'fhqwhgads'); },
/^AssertionError: Missing expected exception: fhqwhgads$/
);

assert.throws(
() => { a.throws(() => {}, TypeError, 'fhqwhgads'); },
/^AssertionError: Missing expected exception \(TypeError\): fhqwhgads$/
);
}

const circular = {y: 1};
circular.x = circular;

Expand Down Expand Up @@ -534,7 +557,7 @@ testAssertionMessage({a: NaN, b: Infinity, c: -Infinity},
});
} catch (e) {
threw = true;
assert.strictEqual(e.message, 'Missing expected exception..');
assert.strictEqual(e.message, 'Missing expected exception.');
}
assert.ok(threw);
}
Expand Down