Commit 749bc16
assert: fix generatedMessage property
This makes sure the `generatedMessage` property is always set as
expected. This was not the case some `assert.throws` and
`assert.rejects` calls.
Backport-PR-URL: #31431
PR-URL: #28263
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent a1d36db commit 749bc16
1 file changed
Lines changed: 10 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -578,14 +578,21 @@ function expectedException(actual, expected, message, fn) { | |||
| 578 | 578 | if (expected.test(str)) | |
| 579 | 579 | return; | |
| 580 | 580 | ||
| 581 | - throw new AssertionError({ | ||
| 581 | + if (!message) { | ||
| 582 | + generatedMessage = true; | ||
| 583 | + message = 'The input did not match the regular expression ' + | ||
| 584 | + `${inspect(expected)}. Input:\n\n${inspect(str)}\n`; | ||
| 585 | + } | ||
| 586 | + | ||
| 587 | + const err = new AssertionError({ | ||
| 582 | 588 | actual, | |
| 583 | 589 | expected, | |
| 584 | - message: message || 'The input did not match the regular expression ' + | ||
| 585 | - `${inspect(expected)}. Input:\n\n${inspect(str)}\n`, | ||
| 590 | + message, | ||
| 586 | 591 | operator: fn.name, | |
| 587 | 592 | stackStartFn: fn | |
| 588 | 593 | }); | |
| 594 | + err.generatedMessage = generatedMessage; | ||
| 595 | + throw err; | ||
| 589 | 596 | } | |
| 590 | 597 | ||
| 591 | 598 | // Handle primitives properly. | |
0 commit comments