assert: ensure .rejects() disallows sync throws

not-an-aardvark · MylesBorins · commit 0d241ba3856d · 2018-11-04T12:31:09.000Z
This updates `assert.rejects()` to disallow any errors that are thrown synchronously from the given function. Previously, throwing an error would cause the same behavior as returning a rejected Promise. Fixes: #19646 Backport-PR-URL: #24019 PR-URL: #19650 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/lib/assert.js b/lib/assert.js
@@ -722,8 +722,11 @@ async function waitForActual(block) {
 if (typeof block !== 'function') {
 throw new errors.ERR_INVALID_ARG_TYPE('block', 'Function', block);
 }
+
+ // Return a rejected promise if `block` throws synchronously.
+ const resultPromise = block();
 try {
- await block();
+ await resultPromise;
 } catch (e) {
 return e;
 }
diff --git a/test/parallel/test-assert-async.js b/test/parallel/test-assert-async.js
@@ -13,7 +13,7 @@ common.crashOnUnhandledRejection();
 
 (async () => {
 await assert.rejects(
- () => assert.fail(),
+ async () => assert.fail('Failed'),
 common.expectsError({
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
@@ -57,4 +57,17 @@ common.crashOnUnhandledRejection();
 }
 );
 }
+
+ {
+ const THROWN_ERROR = new Error();
+
+ await assert.rejects(() => {
+ throw THROWN_ERROR;
+ }).then(common.mustNotCall())
+ .catch(
+ common.mustCall((err) => {
+ assert.strictEqual(err, THROWN_ERROR);
+ })
+ );
+ }
 })().then(common.mustCall());

Original file line number	Diff line number	Diff line change
`@@ -722,8 +722,11 @@ async function waitForActual(block) {`
`722`	`722`	`if(typeofblock!=='function'){`
`723`	`723`	`thrownewerrors.ERR_INVALID_ARG_TYPE('block','Function',block);`
`724`	`724`	`}`
	`725`	`+`
	`726`	+// Return a rejected promise if `block` throws synchronously.
	`727`	`+constresultPromise=block();`
`725`	`728`	`try{`
`726`		`-awaitblock();`
	`729`	`+awaitresultPromise;`
`727`	`730`	`}catch(e){`
`728`	`731`	`returne;`
`729`	`732`	`}`
-Original file line number
+Diff line change
 (async()=>{
 awaitassert.rejects(
 -()=>assert.fail(),
 +async()=>assert.fail('Failed'),
 common.expectsError({
 code: 'ERR_ASSERTION',
 type: assert.AssertionError,
+}
 );
+}
++
 +{
 +constTHROWN_ERROR=newError();
++
 +awaitassert.rejects(()=>{
 +throwTHROWN_ERROR;
 +}).then(common.mustNotCall())
 +.catch(
 +common.mustCall((err)=>{
 +assert.strictEqual(err,THROWN_ERROR);
 +})
 +);
 +}
 })().then(common.mustCall());