Readability and correct exit code

🐿 v2.7.0
Financial-Times · Apr 13, 2018 · 1e559a1 · 1e559a1
1 parent f6fa93f
commit 1e559a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/smoke/smoke-test.js b/lib/smoke/smoke-test.js
@@ -120,13 +120,15 @@ class SmokeTest {
 				errors: results.filter(url => url.errors > 0)
 			};
 
+			const timeTaken = new Date(new Date().getTime() - startTime).toISOString().substr(14, 5);
+
 			console.log('--------------------------------');
 			console.log(chalk`{bold.underline Smoke Test Results}`);
 			console.log(chalk`{bgBlue URLs tested:} ${totalResults.urlsTested}`);
 			console.log(chalk`{bgGreen Passed:} ${totalResults.passed.length}`);
 			console.log(chalk`{bgRed Failed:} ${totalResults.failed.length}`);
 			console.log(chalk`{bgBlack Errors:} ${totalResults.errors.length}`);
-			console.log(chalk`{bgWhite Time Taken:} ${new Date(new Date().getTime() - startTime).toISOString().substr(14, 5)}s`);
+			console.log(chalk`{bgWhite Time Taken:} ${timeTaken}s`);
 			console.log('--------------------------------');
 
 			await this.cleanup();

diff --git a/tasks/smoke.js b/tasks/smoke.js
@@ -44,7 +44,7 @@ module.exports = (program) => {
 					// eslint-disable-next-line no-console
 					console.error(err);
 				}
-				process.exit(2);
+				process.exit(1);
 			});
 		});
 };
diff --git a/test/tasks/smoke.test.js b/test/tasks/smoke.test.js
@@ -130,7 +130,7 @@ describe('Smoke Tests of the Smoke', () => {
 		test('should exit with a bad code if the test fails', (done) => {
 			const proc = spawn('./bin/n-test.js', ['smoke', '--host', 'http://localhost:3004', '--config', 'test/fixtures/smoke-fail.js']);
 			proc.on('close', (code) => {
-				expect(code).toEqual(2);
+				expect(code).toEqual(1);
 				done();
 			});
 		});