PR feedback.

Added indentString support.
Fixed up readme.

Author: nowells

lib/reporters/mini.js

@@ -167,7 +167,13 @@ class MiniReporter {
 
 				if (test.logs) {
 					test.logs.forEach(log => {
-						status += '  ' + colors.information(figures.info) + ' ' + colors.log(log) + '\n';
+						const logLines = indentString(colors.log(log), 6);
+						const logLinesWithLeadingFigure = logLines.replace(
+							/^ {6}/,
+							`    ${colors.information(figures.info)} `
+						);
+
+						status += logLinesWithLeadingFigure + '\n';
 					});
 
 					status += '\n';

lib/reporters/tap.js

@@ -65,7 +65,13 @@ class TapReporter {
 		const appendLogs = () => {
 			if (test.logs) {
 				test.logs.forEach(log => {
-					output.push(`  ${log}`);
+					const logLines = indentString(log, 4);
+					const logLinesWithLeadingFigure = logLines.replace(
+						/^ {4}/,
+						'  * '
+					);
+
+					output.push(logLinesWithLeadingFigure);
 				});
 			}
 		};

lib/reporters/verbose.js

@@ -45,7 +45,13 @@ class VerboseReporter {
 
 		if (test.logs) {
 			test.logs.forEach(log => {
-				lines.push('    ' + colors.information(figures.info) + ' ' + colors.log(log));
+				const logLines = indentString(colors.log(log), 6);
+				const logLinesWithLeadingFigure = logLines.replace(
+					/^ {6}/,
+					`    ${colors.information(figures.info)} `
+				);
+
+				lines.push(logLinesWithLeadingFigure);
 			});
 		}
 
@@ -110,7 +116,13 @@ class VerboseReporter {
 
 				if (test.logs) {
 					test.logs.forEach(log => {
-						output += '    ' + colors.information(figures.info) + ' ' + colors.log(log) + '\n';
+						const logLines = indentString(colors.log(log), 6);
+						const logLinesWithLeadingFigure = logLines.replace(
+							/^ {6}/,
+							`    ${colors.information(figures.info)} `
+						);
+
+						output += logLinesWithLeadingFigure + '\n';
 					});
 
 					output += '\n';

readme.md

@@ -877,7 +877,7 @@ End the test. Only works with `test.cb()`.
 
 ###### `t.log(message)`
 
-Print a log message contextually alongside the test result instead of immediately streaming the message to stdout like `console.log`.
+Print a log message contextually alongside the test result instead of immediately printing it to `stdout` like `console.log`.
 
 ## Assertions
 

test/reporters/mini.js

@@ -2,6 +2,7 @@
 const indentString = require('indent-string');
 const tempWrite = require('temp-write');
 const flatten = require('arr-flatten');
+const figures = require('figures');
 const chalk = require('chalk');
 const sinon = require('sinon');
 const test = require('tap').test;
@@ -934,3 +935,56 @@ test('result when no-color flag is set', t => {
 	t.is(output, expectedOutput);
 	t.end();
 });
+
+test('results with errors and logs', t => {
+	const err1 = new Error('failure one');
+	err1.stack = beautifyStack(err1.stack);
+	const err1Path = tempWrite.sync('a();');
+	err1.source = source(err1Path);
+	err1.avaAssertionError = true;
+	err1.statements = [];
+	err1.values = [
+		{label: 'actual:', formatted: JSON.stringify('abc') + '\n'},
+		{label: 'expected:', formatted: JSON.stringify('abd') + '\n'}
+	];
+
+	const reporter = miniReporter();
+	reporter.failCount = 1;
+
+	const runStatus = {
+		errors: [{
+			title: 'failed one',
+			logs: ['log from a failed test\nwith a newline', 'another log from failed test'],
+			error: err1
+		}]
+	};
+
+	const output = reporter.finish(runStatus);
+	compareLineOutput(t, output, flatten([
+		'',
+		'  ' + chalk.red('1 failed'),
+		'',
+		'  ' + chalk.bold.white('failed one'),
+		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('log from a failed test'),
+		'      ' + chalk.gray('with a newline'),
+		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('another log from failed test'),
+		'',
+		'  ' + chalk.grey(`${err1.source.file}:${err1.source.line}`),
+		'',
+		indentString(codeExcerpt(err1.source), 2).split('\n'),
+		'',
+		/failure one/,
+		'',
+		'  actual:',
+		'',
+		'  "abc"',
+		'',
+		'  expected:',
+		'',
+		'  "abd"',
+		'',
+		stackLineRegex, compareLineOutput.SKIP_UNTIL_EMPTY_LINE,
+		''
+	]));
+	t.end();
+});

test/reporters/tap.js

@@ -272,14 +272,15 @@ test('successful test with logs', t => {
 
 	const actualOutput = reporter.test({
 		title: 'passing',
-		logs: ['log message 1', 'log message 2']
+		logs: ['log message 1\nwith a newline', 'log message 2']
 	});
 
 	const expectedOutput = [
 		'# passing',
 		'ok 1 - passing',
-		'  log message 1',
-		'  log message 2'
+		'  * log message 1',
+		'    with a newline',
+		'  * log message 2'
 	].join('\n');
 
 	t.is(actualOutput, expectedOutput);
@@ -295,14 +296,15 @@ test('failing test with logs', t => {
 			name: 'AssertionError',
 			message: 'false == true'
 		},
-		logs: ['log message 1', 'log message 2']
+		logs: ['log message 1\nwith a newline', 'log message 2']
 	});
 
 	const expectedOutput = [
 		'# failing',
 		'not ok 1 - failing',
-		'  log message 1',
-		'  log message 2',
+		'  * log message 1',
+		'    with a newline',
+		'  * log message 2',
 		'  ---',
 		'    name: AssertionError',
 		'    message: false == true',

test/reporters/verbose.js

@@ -853,12 +853,13 @@ test('successful test with logs', t => {
 
 	const actualOutput = reporter.test({
 		title: 'successful test',
-		logs: ['log message 1', 'log message 2']
+		logs: ['log message 1\nwith a newline', 'log message 2']
 	}, {});
 
 	const expectedOutput = [
 		'  ' + chalk.green(figures.tick) + ' successful test',
 		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('log message 1'),
+		'      ' + chalk.gray('with a newline'),
 		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('log message 2')
 	].join('\n');
 
@@ -872,12 +873,13 @@ test('failed test with logs', t => {
 	const actualOutput = reporter.test({
 		title: 'failed test',
 		error: new Error('failure'),
-		logs: ['log message 1', 'log message 2']
+		logs: ['log message 1\nwith a newline', 'log message 2']
 	}, {});
 
 	const expectedOutput = [
 		'  ' + chalk.red(figures.cross) + ' failed test ' + chalk.red('failure'),
 		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('log message 1'),
+		'      ' + chalk.gray('with a newline'),
 		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('log message 2')
 	].join('\n');
 
@@ -902,7 +904,7 @@ test('results with errors and logs', t => {
 	runStatus.failCount = 1;
 	runStatus.tests = [{
 		title: 'fail one',
-		logs: ['log from failed test', 'another log from failed test'],
+		logs: ['log from failed test\nwith a newline', 'another log from failed test'],
 		error: error1
 	}];
 
@@ -913,6 +915,7 @@ test('results with errors and logs', t => {
 		'',
 		'  ' + chalk.bold.white('fail one'),
 		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('log from failed test'),
+		'      ' + chalk.gray('with a newline'),
 		'    ' + chalk.magenta(figures.info) + ' ' + chalk.gray('another log from failed test'),
 		'',
 		'  ' + chalk.grey(`${error1.source.file}:${error1.source.line}`),