Only print fail-fast when there are remaning tests (#1179)

avajs · Jan 19, 2017 · 5a3b792 · 5a3b792
1 parent a2d7973
commit 5a3b792
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 2 deletions.
diff --git a/lib/reporters/mini.js b/lib/reporters/mini.js
@@ -215,7 +215,7 @@ MiniReporter.prototype.finish = function (runStatus) {
 		});
 	}
 
-	if (runStatus.failFastEnabled === true) {
+	if (runStatus.failFastEnabled === true && runStatus.remainingCount > 0 && runStatus.failCount > 0) {
 		status += '\n\n  ' + colors.information('`--fail-fast` is on. Any number of tests may have been skipped');
 	}
 

diff --git a/lib/reporters/verbose.js b/lib/reporters/verbose.js
@@ -114,7 +114,7 @@ VerboseReporter.prototype.finish = function (runStatus) {
 		});
 	}
 
-	if (runStatus.failFastEnabled === true) {
+	if (runStatus.failFastEnabled === true && runStatus.remainingCount > 0 && runStatus.failCount > 0) {
 		output += '\n\n\n  ' + colors.information('`--fail-fast` is on. Any number of tests may have been skipped');
 	}
 

diff --git a/test/reporters/mini.js b/test/reporters/mini.js
@@ -417,6 +417,8 @@ test('results with unhandled errors', function (t) {
 test('results when fail-fast is enabled', function (t) {
 	var reporter = miniReporter();
 	var runStatus = {
+		remainingCount: 1,
+		failCount: 1,
 		failFastEnabled: true
 	};
 
@@ -429,6 +431,32 @@ test('results when fail-fast is enabled', function (t) {
 	t.end();
 });
 
+test('results without fail-fast if no failing tests', function (t) {
+	var reporter = miniReporter();
+	var runStatus = {
+		remainingCount: 1,
+		failCount: 0,
+		failFastEnabled: true
+	};
+
+	var output = reporter.finish(runStatus);
+	t.is(output, '\n\n');
+	t.end();
+});
+
+test('results without fail-fast if no skipped tests', function (t) {
+	var reporter = miniReporter();
+	var runStatus = {
+		remainingCount: 0,
+		failCount: 1,
+		failFastEnabled: true
+	};
+
+	var output = reporter.finish(runStatus);
+	t.is(output, '\n\n');
+	t.end();
+});
+
 test('results with 1 previous failure', function (t) {
 	var reporter = miniReporter();
 	reporter.todoCount = 1;

diff --git a/test/reporters/verbose.js b/test/reporters/verbose.js
@@ -384,6 +384,7 @@ test('results with errors', function (t) {
 test('results when fail-fast is enabled', function (t) {
 	var reporter = verboseReporter();
 	var runStatus = createRunStatus();
+	runStatus.remainingCount = 1;
 	runStatus.failCount = 1;
 	runStatus.failFastEnabled = true;
 	runStatus.tests = [{
@@ -404,6 +405,46 @@ test('results when fail-fast is enabled', function (t) {
 	t.end();
 });
 
+test('results without fail-fast if no failing tests', function (t) {
+	var reporter = verboseReporter();
+	var runStatus = createRunStatus();
+	runStatus.remainingCount = 1;
+	runStatus.failCount = 0;
+	runStatus.passCount = 1;
+	runStatus.failFastEnabled = true;
+
+	var output = reporter.finish(runStatus);
+	var expectedOutput = [
+		'',
+		'  ' + chalk.green('1 test passed') + time,
+		''
+	].join('\n');
+
+	t.is(output, expectedOutput);
+	t.end();
+});
+
+test('results without fail-fast if no skipped tests', function (t) {
+	var reporter = verboseReporter();
+	var runStatus = createRunStatus();
+	runStatus.remainingCount = 0;
+	runStatus.failCount = 1;
+	runStatus.failFastEnabled = true;
+	runStatus.tests = [{
+		title: 'failed test'
+	}];
+
+	var output = reporter.finish(runStatus);
+	var expectedOutput = [
+		'',
+		'  ' + chalk.red('1 test failed') + time,
+		''
+	].join('\n');
+
+	t.is(output, expectedOutput);
+	t.end();
+});
+
 test('results with 1 previous failure', function (t) {
 	var reporter = createReporter();