Merge pull request #1617 from danielstjules/fix-ie8

Fix 1606: fix err handling in IE <= 8 and non-ES5 browsers
mochajs · Mar 23, 2015 · 41a2119 · 41a2119
2 parents 3e004d1 + 537d019
commit 41a2119
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -206,7 +206,7 @@ Runner.prototype.fail = function(test, err) {
     err = new Error('the ' + type(err) + ' ' + stringify(err) + ' was thrown, throw an Error :)');
   }
 
-  err.stack = this.fullStackTrace
+  err.stack = (this.fullStackTrace || !err.stack)
     ? err.stack
     : stackFilter(err.stack);
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -677,7 +677,7 @@ exports.stackTraceFilter = function() {
   return function(stack) {
     stack = stack.split('\n');
 
-    stack = stack.reduce(function (list, line) {
+    stack = exports.reduce(stack, function(list, line) {
       if (is.node && (isNodeModule(line) ||
         isMochaInternal(line) ||
         isNodeInternal(line)))

diff --git a/mocha.js b/mocha.js
@@ -4779,7 +4779,7 @@ Runner.prototype.fail = function(test, err) {
     err = new Error('the ' + type(err) + ' ' + stringify(err) + ' was thrown, throw an Error :)');
   }
 
-  err.stack = this.fullStackTrace
+  err.stack = (this.fullStackTrace || !err.stack)
     ? err.stack
     : stackFilter(err.stack);
 
@@ -6372,7 +6372,7 @@ exports.stackTraceFilter = function() {
   return function(stack) {
     stack = stack.split('\n');
 
-    stack = stack.reduce(function (list, line) {
+    stack = exports.reduce(stack, function(list, line) {
       if (is.node && (isNodeModule(line) ||
         isMochaInternal(line) ||
         isNodeInternal(line)))