Don't print empty error stacks

avajs · Apr 25, 2020 · af7b2d5 · af7b2d5
1 parent 2e7c76b
commit af7b2d5
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 43 deletions.
diff --git a/lib/reporters/beautify-stack.js b/lib/reporters/beautify-stack.js
@@ -65,5 +65,9 @@ module.exports = stack => {
 		return [];
 	}
 
-	return stackUtils.clean(stack).trim().split('\n');
+	return stackUtils.clean(stack)
+		.trim()
+		.split('\n')
+		.map(line => line.trim())
+		.filter(line => line !== '');
 };
diff --git a/lib/reporters/mini.js b/lib/reporters/mini.js
@@ -324,27 +324,29 @@ class MiniReporter {
 			this.lineWriter.writeLine(evt.err.summary);
 		}
 
-		if (evt.err.stack) {
-			const {stack} = evt.err;
-			if (stack.includes('\n')) {
-				this.lineWriter.writeLine();
-				this.lineWriter.writeLine(this.formatErrorStack(evt.err));
-			}
+		const formatted = this.formatErrorStack(evt.err);
+		if (formatted.length > 0) {
+			this.lineWriter.writeLine();
+			this.lineWriter.writeLine(formatted.join('\n'));
 		}
 	}
 
 	formatErrorStack(error) {
+		if (!error.stack) {
+			return [];
+		}
+
 		if (error.shouldBeautifyStack) {
 			return beautifyStack(error.stack).map(line => {
 				if (nodeInternals.some(internal => internal.test(line))) {
 					return colors.errorStackInternal(`${figures.pointerSmall} ${line}`);
 				}
 
 				return colors.errorStack(`${figures.pointerSmall} ${line}`);
-			}).join('\n');
+			});
 		}
 
-		return error.stack;
+		return [error.stack];
 	}
 
 	writeLogs(evt) {

diff --git a/lib/reporters/verbose.js b/lib/reporters/verbose.js
@@ -263,27 +263,29 @@ class VerboseReporter {
 			this.lineWriter.writeLine(evt.err.summary);
 		}
 
-		if (evt.err.stack) {
-			const {stack} = evt.err;
-			if (stack.includes('\n')) {
-				this.lineWriter.writeLine();
-				this.lineWriter.writeLine(this.formatErrorStack(evt.err));
-			}
+		const formatted = this.formatErrorStack(evt.err);
+		if (formatted.length > 0) {
+			this.lineWriter.writeLine();
+			this.lineWriter.writeLine(formatted.join('\n'));
 		}
 	}
 
 	formatErrorStack(error) {
+		if (!error.stack) {
+			return [];
+		}
+
 		if (error.shouldBeautifyStack) {
 			return beautifyStack(error.stack).map(line => {
 				if (nodeInternals.some(internal => internal.test(line))) {
 					return colors.errorStackInternal(`${figures.pointerSmall} ${line}`);
 				}
 
 				return colors.errorStack(`${figures.pointerSmall} ${line}`);
-			}).join('\n');
+			});
 		}
 
-		return error.stack;
+		return [error.stack];
 	}
 
 	writePendingTests(evt) {

diff --git a/test-tap/reporters/mini.regular.v12.log b/test-tap/reporters/mini.regular.v12.log
@@ -204,8 +204,6 @@
 
   Error: Test was expected to fail, but succeeded, you should stop marking the test as failing
 
-  [90m› [39m
-
 
 
   [1mtest [90m[2m›[22m[1m[39m logs[22m
@@ -325,8 +323,6 @@
 
   [33mnull[39m
 
-  [90m› [39m
-
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throws[22m

diff --git a/test-tap/reporters/mini.regular.v13.log b/test-tap/reporters/mini.regular.v13.log
@@ -204,8 +204,6 @@
 
   Error: Test was expected to fail, but succeeded, you should stop marking the test as failing
 
-  [90m› [39m
-
 
 
   [1mtest [90m[2m›[22m[1m[39m logs[22m
@@ -325,8 +323,6 @@
 
   [33mnull[39m
 
-  [90m› [39m
-
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throws[22m

diff --git a/test-tap/reporters/mini.regular.v14.log b/test-tap/reporters/mini.regular.v14.log
@@ -204,8 +204,6 @@
 
   Error: Test was expected to fail, but succeeded, you should stop marking the test as failing
 
-  [90m› [39m
-
 
 
   [1mtest [90m[2m›[22m[1m[39m logs[22m
@@ -325,8 +323,6 @@
 
   [33mnull[39m
 
-  [90m› [39m
-
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throws[22m

diff --git a/test-tap/reporters/verbose.regular.v12.log b/test-tap/reporters/verbose.regular.v12.log
@@ -164,8 +164,6 @@
 
   Error: Test was expected to fail, but succeeded, you should stop marking the test as failing
 
-  [90m› [39m
-
 
 
   [1mtest [90m[2m›[22m[1m[39m logs[22m
@@ -285,8 +283,6 @@
 
   [33mnull[39m
 
-  [90m› [39m
-
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throws[22m

diff --git a/test-tap/reporters/verbose.regular.v13.log b/test-tap/reporters/verbose.regular.v13.log
@@ -24,7 +24,7 @@
     output-in-hook [90m[2m›[22m[39m beforeEach hook for failing test
     [35mℹ[39m [90mbeforeEach[39m
 ---tty-stream-chunk-separator
-  [32m✔[39m output-in-hook [90m[2m›[22m[39m passing test
+  [32m✔[39m output-in-hook [90m[2m›[22m[39m passing test[90m[2m (105ms)[22m[39m
 ---tty-stream-chunk-separator
   [31m✖[39m output-in-hook [90m[2m›[22m[39m failing test [31mTest failed via `t.fail()`[39m
 ---tty-stream-chunk-separator
@@ -164,8 +164,6 @@
 
   Error: Test was expected to fail, but succeeded, you should stop marking the test as failing
 
-  [90m› [39m
-
 
 
   [1mtest [90m[2m›[22m[1m[39m logs[22m
@@ -285,8 +283,6 @@
 
   [33mnull[39m
 
-  [90m› [39m
-
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throws[22m

diff --git a/test-tap/reporters/verbose.regular.v14.log b/test-tap/reporters/verbose.regular.v14.log
@@ -164,8 +164,6 @@
 
   Error: Test was expected to fail, but succeeded, you should stop marking the test as failing
 
-  [90m› [39m
-
 
 
   [1mtest [90m[2m›[22m[1m[39m logs[22m
@@ -285,8 +283,6 @@
 
   [33mnull[39m
 
-  [90m› [39m
-
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throws[22m

diff --git a/test-tap/reporters/verbose.watch.v12.log b/test-tap/reporters/verbose.watch.v12.log
@@ -10,7 +10,7 @@
 ---tty-stream-chunk-separator
 
 ---tty-stream-chunk-separator
-  [32m✔[39m test [90m[2m›[22m[39m passes
+  [32m✔[39m test [90m[2m›[22m[39m passes[90m[2m (198ms)[22m[39m
 ---tty-stream-chunk-separator
 
   [32m1 test passed[39m [90m[2m[17:19:12][22m[39m