Merge pull request #446 from danielbprice/master

Issue #442 chai can't cope with AssertionErrors raised from node's assert
chaijs · Oct 2, 2015 · 7f5a108 · 7f5a108
2 parents 22fbd65 + ab02c6f
commit 7f5a108
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/chai/core/assertions.js b/lib/chai/core/assertions.js
@@ -1247,9 +1247,9 @@ module.exports = function (chai, _) {
       constructor = null;
       errMsg = null;
     } else if (typeof constructor === 'function') {
-      name = constructor.prototype.name || constructor.name;
-      if (name === 'Error' && constructor !== Error) {
-        name = (new constructor()).name;
+      name = constructor.prototype.name;
+      if (!name || (name === 'Error' && constructor !== Error)) {
+        name = constructor.name || (new constructor()).name;
       }
     } else {
       constructor = null;