assert: accommodate ES6 classes that extend Error

Trott · Myles Borins · commit 87181cd74cd6 · 2016-01-19T11:52:42.000-08:00
`assert.throws()` and `assert.doesNotThrow()` blow up with a `TypeError` if used with an ES6 class that extends Error. Fixes: #3188 PR-URL: #4166 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/lib/assert.js b/lib/assert.js
@@ -283,6 +283,10 @@ function expectedException(actual, expected) {
 // Ignore. The instanceof check doesn't work for arrow functions.
 }
 
+ if (Error.isPrototypeOf(expected)) {
+ return false;
+ }
+
 return expected.call({}, actual) === true;
 }
 
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -342,9 +342,28 @@ a.throws(makeBlock(thrower, TypeError), function(err) {
 }
 });
 
+// https://github.com/nodejs/node/issues/3188
+threw = false;
 
-// GH-207. Make sure deepEqual doesn't loop forever on circular refs
+try {
+ var ES6Error = class extends Error {};
+
+ var AnotherErrorType = class extends Error {};
 
+ const functionThatThrows = function() {
+ throw new AnotherErrorType('foo');
+ };
+
+ assert.throws(functionThatThrows, ES6Error);
+} catch (e) {
+ threw = true;
+ assert(e instanceof AnotherErrorType,
+ `expected AnotherErrorType, received ${e}`);
+}
+
+assert.ok(threw);
+
+// GH-207. Make sure deepEqual doesn't loop forever on circular refs
 var b = {};
 b.b = b;
 

Original file line number	Diff line number	Diff line change
`@@ -283,6 +283,10 @@ function expectedException(actual, expected) {`
`283`	`283`	`// Ignore. The instanceof check doesn't work for arrow functions.`
`284`	`284`	`}`
`285`	`285`
	`286`	`+if(Error.isPrototypeOf(expected)){`
	`287`	`+returnfalse;`
	`288`	`+}`
	`289`	`+`
`286`	`290`	`returnexpected.call({},actual)===true;`
`287`	`291`	`}`
`288`	`292`
-Original file line number
+Diff line change
+}
 });
 +// https://github.com/nodejs/node/issues/3188
 +threw=false;
 -// GH-207. Make sure deepEqual doesn't loop forever on circular refs
 +try{
 +varES6Error=classextendsError{};
++
 +varAnotherErrorType=classextendsError{};
 +constfunctionThatThrows=function(){
 +thrownewAnotherErrorType('foo');
 +};
++
 +assert.throws(functionThatThrows,ES6Error);
 +}catch(e){
 +threw=true;
 +assert(einstanceofAnotherErrorType,
 +`expected AnotherErrorType, received ${e}`);
 +}
++
 +assert.ok(threw);
++
 +// GH-207. Make sure deepEqual doesn't loop forever on circular refs
 varb={};
 b.b=b;