Merge mini and verbose reporter implementations

Co-authored-by: Mark Wubben <mark@novemberborn.net>

Author: m5x5

lib/cli.js

@@ -259,8 +259,7 @@ exports.run = async () => { // eslint-disable-line complexity
 
 	const ciParallelVars = require('ci-parallel-vars');
 	const Api = require('./api');
-	const VerboseReporter = require('./reporters/verbose');
-	const MiniReporter = require('./reporters/mini');
+	const DefaultReporter = require('./reporters/default');
 	const TapReporter = require('./reporters/tap');
 	const Watcher = require('./watcher');
 	const normalizeExtensions = require('./extensions');
@@ -391,19 +390,13 @@ exports.run = async () => { // eslint-disable-line complexity
 			reportStream: process.stdout,
 			stdStream: process.stderr
 		});
-	} else if (debug !== null || combined.verbose || isCi || !process.stdout.isTTY) {
-		reporter = new VerboseReporter({
-			projectDir,
-			reportStream: process.stdout,
-			stdStream: process.stderr,
-			watching: combined.watch
-		});
 	} else {
-		reporter = new MiniReporter({
+		reporter = new DefaultReporter({
 			projectDir,
 			reportStream: process.stdout,
 			stdStream: process.stderr,
-			watching: combined.watch
+			watching: combined.watch,
+			verbose: debug !== null || combined.verbose || isCi || !process.stdout.isTTY
 		});
 	}
 

lib/reporters/default.js

@@ -10,7 +10,7 @@ const path = require('path');
 const {test} = require('tap');
 const TTYStream = require('../helper/tty-stream');
 const report = require('../helper/report');
-const MiniReporter = require('../../lib/reporters/mini');
+const Reporter = require('../../lib/reporters/default');
 
 const run = (type, sanitizers = []) => t => {
 	t.plan(1);
@@ -21,7 +21,7 @@ const run = (type, sanitizers = []) => t => {
 		columns: 200,
 		sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.version]
 	});
-	const reporter = new MiniReporter({
+	const reporter = new Reporter({
 		projectDir: report.projectDir(type),
 		spinner: {
 			interval: 60 * 60 * 1000, // No need to update the spinner
@@ -32,6 +32,7 @@ const run = (type, sanitizers = []) => t => {
 		stdStream: tty,
 		watching: type === 'watch'
 	});
+
 	return report[type](reporter)
 		.then(() => {
 			tty.end();

lib/reporters/mini.js

@@ -4,7 +4,7 @@ const {test} = require('tap');
 const {restoreClock} = require('../helper/fix-reporter-env')();
 const TTYStream = require('../helper/tty-stream');
 const report = require('../helper/report');
-const VerboseReporter = require('../../lib/reporters/verbose');
+const Reporter = require('../../lib/reporters/default');
 
 const run = (type, sanitizers = []) => t => {
 	t.plan(1);
@@ -15,13 +15,15 @@ const run = (type, sanitizers = []) => t => {
 		columns: 200,
 		sanitizers: [...sanitizers, report.sanitizers.cwd, report.sanitizers.experimentalWarning, report.sanitizers.posix, report.sanitizers.version]
 	});
-	const reporter = new VerboseReporter({
+	const reporter = new Reporter({
 		projectDir: report.projectDir(type),
 		durationThreshold: 60000,
 		reportStream: tty,
 		stdStream: tty,
+		verbose: true,
 		watching: type === 'watch'
 	});
+
 	return report[type](reporter)
 		.then(() => {
 			tty.end();