From 87181cd74cd66930a656ce743a60dd8de612aa65 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 5 Dec 2015 17:29:28 -0800
Subject: [PATCH] assert: accommodate ES6 classes that extend Error

`assert.throws()` and `assert.doesNotThrow()` blow up with a `TypeError`
if used with an ES6 class that extends Error.

Fixes: https://github.com/nodejs/node/issues/3188
PR-URL: https://github.com/nodejs/node/pull/4166
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 lib/assert.js                |  4 ++++
 test/parallel/test-assert.js | 21 ++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/assert.js b/lib/assert.js
index f8dc97d..3e52ab4 100644
--- 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
index b28ca03..e9c01fd 100644
--- 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;
 
-- 
2.7.4