Simplify failure output - fixes #1072 (#1234)

avajs · Feb 14, 2017 · da68f29 · da68f29
1 parent 2c683b9
commit da68f29
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 26 deletions.
diff --git a/lib/reporters/mini.js b/lib/reporters/mini.js
@@ -204,7 +204,10 @@ class MiniReporter {
 				}
 
 				if (test.error.stack) {
-					status += '\n' + indentString(colors.errorStack(extractStack(test.error.stack)), 2);
+					const extracted = extractStack(test.error.stack);
+					if (extracted.includes('\n')) {
+						status += '\n' + indentString(colors.errorStack(extracted), 2);
+					}
 				}
 			});
 		}

diff --git a/lib/reporters/verbose.js b/lib/reporters/verbose.js
@@ -123,7 +123,10 @@ class VerboseReporter {
 				}
 
 				if (test.error.stack) {
-					output += '\n' + indentString(colors.errorStack(extractStack(test.error.stack)), 2);
+					const extracted = extractStack(test.error.stack);
+					if (extracted.includes('\n')) {
+						output += '\n' + indentString(colors.errorStack(extracted), 2);
+					}
 				}
 			});
 		}

diff --git a/test/reporters/mini.js b/test/reporters/mini.js
@@ -409,9 +409,7 @@ test('results with errors', t => {
 		indentString(codeExcerpt(err2Path, err2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(err2), 2).split('\n'),
-		/failure two/,
-		'',
-		stackLineRegex
+		/failure two/
 	]));
 	t.end();
 });
@@ -470,9 +468,7 @@ test('results with errors and disabled code excerpts', t => {
 		indentString(codeExcerpt(err2Path, err2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(err2), 2).split('\n'),
-		/failure two/,
-		'',
-		stackLineRegex
+		/failure two/
 	]));
 	t.end();
 });
@@ -534,9 +530,7 @@ test('results with errors and broken code excerpts', t => {
 		indentString(codeExcerpt(err2Path, err2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(err2), 2).split('\n'),
-		/failure two/,
-		'',
-		stackLineRegex
+		/failure two/
 	]));
 	t.end();
 });
@@ -599,9 +593,7 @@ test('results with errors and disabled assert output', t => {
 		indentString(codeExcerpt(err2Path, err2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(err2), 2).split('\n'),
-		/failure two/,
-		'',
-		stackLineRegex
+		/failure two/
 	]));
 	t.end();
 });

diff --git a/test/reporters/verbose.js b/test/reporters/verbose.js
@@ -416,9 +416,7 @@ test('results with errors', t => {
 		indentString(codeExcerpt(err2Path, error2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(error2), 2).split('\n'),
-		/error two message/,
-		'',
-		stackLineRegex
+		/error two message/
 	]));
 	t.end();
 });
@@ -474,9 +472,7 @@ test('results with errors and disabled code excerpts', t => {
 		indentString(codeExcerpt(err2Path, error2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(error2), 2).split('\n'),
-		/error two message/,
-		'',
-		stackLineRegex
+		/error two message/
 	]));
 	t.end();
 });
@@ -535,9 +531,7 @@ test('results with errors and disabled code excerpts', t => {
 		indentString(codeExcerpt(err2Path, error2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(error2), 2).split('\n'),
-		/error two message/,
-		'',
-		stackLineRegex
+		/error two message/
 	]));
 	t.end();
 });
@@ -597,9 +591,7 @@ test('results with errors and disabled assert output', t => {
 		indentString(codeExcerpt(err2Path, error2.source.line), 2).split('\n'),
 		'',
 		indentString(formatAssertError(error2), 2).split('\n'),
-		/error two message/,
-		'',
-		stackLineRegex
+		/error two message/
 	]));
 	t.end();
 });