split err.stack at the trailing frame block so embedded stacks in err.message render once

Author: mostafaNazari702

lib/reporters/base.js

@@ -404,38 +404,58 @@ var getFullErrorStack = function (err, seen) {
   }
 
   var message;
+  var usedInspect = false;
 
   if (typeof err.inspect === "function") {
     message = err.inspect() + "";
+    usedInspect = true;
   } else if (err.message && typeof err.message.toString === "function") {
     message = err.message + "";
   } else {
     message = "";
   }
 
-  var msg;
-  var stack = err.stack || message;
-  var index = message ? stack.indexOf(message) : -1;
+  var rawStack = err.stack || message;
+  var lines = rawStack.split("\n");
+  var frameStart = lines.length;
+  for (var i = lines.length - 1; i >= 0; i--) {
+    if (/^\s+at\s/.test(lines[i])) {
+      frameStart = i;
+    } else {
+      break;
+    }
+  }
 
-  if (index === -1) {
-    msg = message;
+  var msg;
+  var stack;
+  var splitSucceeded = false;
+  if (frameStart < lines.length) {
+    stack = lines.slice(frameStart).join("\n");
+    msg = usedInspect ? message : lines.slice(0, frameStart).join("\n");
+    splitSucceeded = true;
   } else {
-    index += message.length;
-    msg = stack.slice(0, index);
-    // remove msg from stack
-    stack = stack.slice(index + 1);
-
-    if (err.cause) {
-      seen = seen || new Set();
-      seen.add(err);
-      const causeStack = getFullErrorStack(err.cause, seen);
-      stack +=
-        "\n   Caused by: " +
-        causeStack.msg +
-        (causeStack.stack ? "\n" + causeStack.stack : "");
+    var index = message ? rawStack.indexOf(message) : -1;
+    if (index === -1) {
+      msg = message;
+      stack = rawStack;
+    } else {
+      index += message.length;
+      msg = rawStack.slice(0, index);
+      stack = rawStack.slice(index + 1);
+      splitSucceeded = true;
     }
   }
 
+  if (splitSucceeded && err.cause) {
+    seen = seen || new Set();
+    seen.add(err);
+    const causeStack = getFullErrorStack(err.cause, seen);
+    stack +=
+      "\n   Caused by: " +
+      causeStack.msg +
+      (causeStack.stack ? "\n" + causeStack.stack : "");
+  }
+
   return {
     message,
     msg,

test/reporters/base.spec.js

@@ -568,6 +568,31 @@ describe("Base reporter", function () {
       );
     });
 
+    it("should not duplicate the message when it contains an embedded stack", function () {
+      var embeddedMessage =
+        "An error occured with following trace:\n\nError\n    at inner (foo.js:1:1)\n    at outer (foo.js:2:2)";
+      var err = {
+        message: embeddedMessage,
+        stack:
+          "Error: " +
+          embeddedMessage +
+          "\n    at outer (foo.js:2:2)\n    at runTest (lib/runner.js:1:1)",
+        showDiff: false,
+      };
+      var test = makeTest(err);
+
+      list([test]);
+
+      var errOut = stdout.join("\n").trim();
+      expect(
+        errOut.match(/Error: An error occured with following trace:/g),
+        "to have length",
+        1,
+      );
+      expect(errOut, "to contain", "at runTest (lib/runner.js:1:1)");
+      expect(errOut.match(/at inner \(foo\.js:1:1\)/g), "to have length", 1);
+    });
+
     it("should not add cause trail if error does not contain message", function () {
       var err = {
         message: "Error",