Don't print empty error stacks

novemberborn · novemberborn · commit af7b2d59f163 · 2020-04-25T14:43:24.000+02:00
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

Original file line number	Diff line number	Diff line change
`@@ -324,27 +324,29 @@ class MiniReporter {`
`324`	`324`	`this.lineWriter.writeLine(evt.err.summary);`
`325`	`325`	`}`
`326`	`326`
`327`		`- if (evt.err.stack) {`
`328`		`- const {stack} = evt.err;`
`329`		`- if (stack.includes('\n')) {`
`330`		`- this.lineWriter.writeLine();`
`331`		`- this.lineWriter.writeLine(this.formatErrorStack(evt.err));`
`332`		`- }`
	`327`	`+ const formatted = this.formatErrorStack(evt.err);`
	`328`	`+ if (formatted.length > 0) {`
	`329`	`+ this.lineWriter.writeLine();`
	`330`	`+ this.lineWriter.writeLine(formatted.join('\n'));`
`333`	`331`	`}`
`334`	`332`	`}`
`335`	`333`
`336`	`334`	`formatErrorStack(error) {`
	`335`	`+ if (!error.stack) {`
	`336`	`+ return [];`
	`337`	`+ }`
	`338`	`+`
`337`	`339`	`if (error.shouldBeautifyStack) {`
`338`	`340`	`return beautifyStack(error.stack).map(line => {`
`339`	`341`	`if (nodeInternals.some(internal => internal.test(line))) {`
`340`	`342`	return colors.errorStackInternal(`${figures.pointerSmall} ${line}`);
`341`	`343`	`}`
`342`	`344`
`343`	`345`	return colors.errorStack(`${figures.pointerSmall} ${line}`);
`344`		`- }).join('\n');`
	`346`	`+ });`
`345`	`347`	`}`
`346`	`348`
`347`		`- return error.stack;`
	`349`	`+ return [error.stack];`
`348`	`350`	`}`
`349`	`351`
`350`	`352`	`writeLogs(evt) {`
Original file line number	Diff line number	Diff line change
`@@ -263,27 +263,29 @@ class VerboseReporter {`
`263`	`263`	`this.lineWriter.writeLine(evt.err.summary);`
`264`	`264`	`}`
`265`	`265`
`266`		`- if (evt.err.stack) {`
`267`		`- const {stack} = evt.err;`
`268`		`- if (stack.includes('\n')) {`
`269`		`- this.lineWriter.writeLine();`
`270`		`- this.lineWriter.writeLine(this.formatErrorStack(evt.err));`
`271`		`- }`
	`266`	`+ const formatted = this.formatErrorStack(evt.err);`
	`267`	`+ if (formatted.length > 0) {`
	`268`	`+ this.lineWriter.writeLine();`
	`269`	`+ this.lineWriter.writeLine(formatted.join('\n'));`
`272`	`270`	`}`
`273`	`271`	`}`
`274`	`272`
`275`	`273`	`formatErrorStack(error) {`
	`274`	`+ if (!error.stack) {`
	`275`	`+ return [];`
	`276`	`+ }`
	`277`	`+`
`276`	`278`	`if (error.shouldBeautifyStack) {`
`277`	`279`	`return beautifyStack(error.stack).map(line => {`
`278`	`280`	`if (nodeInternals.some(internal => internal.test(line))) {`
`279`	`281`	return colors.errorStackInternal(`${figures.pointerSmall} ${line}`);
`280`	`282`	`}`
`281`	`283`
`282`	`284`	return colors.errorStack(`${figures.pointerSmall} ${line}`);
`283`		`- }).join('\n');`
	`285`	`+ });`
`284`	`286`	`}`
`285`	`287`
`286`		`- return error.stack;`
	`288`	`+ return [error.stack];`
`287`	`289`	`}`
`288`	`290`
`289`	`291`	`writePendingTests(evt) {`
-Original file line number
+Diff line change
   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
   [33mnull[39m
 -  [90m› [39m
+-
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throws[22m