fixes error cutoff issue #276

petkaantonov · Aug 11, 2014 · 0d2885a · 0d2885a
1 parent 0a23d44
commit 0d2885a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/captured_trace.js b/src/captured_trace.js
@@ -101,7 +101,7 @@ CapturedTrace.combine = function CapturedTrace$Combine(current, prev) {
     //that nobody cares about
     for (var i = 0, len = lines.length; i < len; ++i) {
 
-        if ((rignore.test(lines[i]) ||
+        if (((rignore.test(lines[i]) && rtraceline.test(lines[i])) ||
             (i > 0 && !rtraceline.test(lines[i])) &&
             lines[i] !== FROM_PREVIOUS_EVENT)
        ) {

diff --git a/test/mocha/github-2xx-76.js b/test/mocha/github-2xx-76.js
@@ -0,0 +1,18 @@
+"use strict";
+
+
+var Promise = require("../../js/debug/bluebird.js");
+Promise.longStackTraces();
+var assert = require("assert");
+
+describe("github276 - stack trace cleaner", function(){
+    specify("message with newline and a$_b should not be removed", function(done){
+        Promise.resolve(1).then(function() {
+            throw new Error("Blah\n          a$_b");
+        }).catch(function(e) {
+            var msg = e.stack.split('\n')[1]
+            assert(msg.indexOf('a$_b') >= 0, 'message should contain a$_b');
+        }).done(done, done);
+    });
+});
+