assert: fix generatedMessage property

BridgeAR · BridgeAR · commit 0b3242c3ce0f · 2019-10-01T22:55:11.000+02:00
This makes sure the `generatedMessage` property is always set as expected. This was not the case some `assert.throws` and `assert.rejects` calls. 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>
diff --git a/lib/assert.js b/lib/assert.js
@@ -571,14 +571,21 @@ function expectedException(actual, expected, message, fn) {
 if (expected.test(str))
 return;
 
- throw new AssertionError({
+ if (!message) {
+ generatedMessage = true;
+ message = 'The input did not match the regular expression ' +
+ `${inspect(expected)}. Input:\n\n${inspect(str)}\n`;
+ }
+
+ const err = new AssertionError({
 actual,
 expected,
- message: message || 'The input did not match the regular expression ' +
- `${inspect(expected)}. Input:\n\n${inspect(str)}\n`,
+ message,
 operator: fn.name,
 stackStartFn: fn
 });
+ err.generatedMessage = generatedMessage;
+ throw err;
 }
 
 // Handle primitives properly.

-Original file line number
+Diff line change
 if(expected.test(str))
 return;
 -thrownewAssertionError({
 +if(!message){
 +generatedMessage=true;
 +message='The input did not match the regular expression '+
 +`${inspect(expected)}. Input:\n\n${inspect(str)}\n`;
 +}
++
 +consterr=newAssertionError({
  actual,
  expected,
 -message: message||'The input did not match the regular expression '+
 -`${inspect(expected)}. Input:\n\n${inspect(str)}\n`,
 + message,
 operator: fn.name,
 stackStartFn: fn
 });
 +err.generatedMessage=generatedMessage;
 +throwerr;
+}
 // Handle primitives properly.