Merge pull request #894 from geek/master

Have correct exit code with multiple reporters
hapijs · Nov 13, 2018 · d5c6976 · d5c6976
2 parents 6dbb48c + 4ef5bc4
commit d5c6976
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/bin/lab b/bin/lab
@@ -55,9 +55,6 @@ if (process.env.NODE_DEBUG_OPTION || inspectArg) {
 const main = async () => {
 
     let { code } = await require('../lib/cli').run();
-    if (typeof code !== 'number') {
-        code = code[Object.keys(code)[0]];
-    }
     process.exit(code);
 };
 

diff --git a/lib/reporters/multiple.js b/lib/reporters/multiple.js
@@ -73,15 +73,14 @@ internals.Reporter.prototype.report = function (text) {
 
 internals.Reporter.prototype.finalize = async function (notebook) {
 
-    this._results = { err: false, code: [], output: [], count: 0 };
+    this._results = { err: false, code: 0, output: [], count: 0 };
 
     for (const key in this._reporters) {
         this._results.count++;
         try {
             const { code, output } = await this._reporters[key].finalize(notebook);
-            this._results.code[key] = code;
+            this._results.code = this._results.code || code;
             this._results.output[key] = output;
-            this._results.processCode = this._results.processCode || code;
         }
         catch (ex) {
             this._results.err = this._results.err || ex;

diff --git a/test/cli.js b/test/cli.js
@@ -118,7 +118,7 @@ describe('CLI', () => {
 
     it('exits with code 1 when function returns error with multiple reporters', async () => {
 
-        const result = await RunCli(['test/cli_failure/failure.js', '-r', 'console', '-r', 'lcov']);
+        const result = await RunCli(['test/cli_throws/throws.js', '-r', 'console', '-r', 'lcov']);
         expect(result.code).to.equal(1);
     });
 

diff --git a/test/cli_throws/throws.js b/test/cli_throws/throws.js
@@ -20,14 +20,14 @@ const it = lab.it;
 
 describe('Test CLI throws', () => {
 
-    after((done) => {
+    after(() => {
 
         throw new Error('throwing after');
     });
 
-    it('handles thrown error', (done) => {
+    it('handles thrown error', () => {
 
-        done();
+        throw new Error('throwing in test');
     });
 });
 
diff --git a/test/reporters.js b/test/reporters.js
@@ -1863,8 +1863,7 @@ describe('Reporter', () => {
             const filename = Path.join(Os.tmpdir(), [Date.now(), process.pid, Crypto.randomBytes(8).toString('hex')].join('-'));
 
             const { code, output } = await Lab.report(script, { reporter: ['lcov', 'console'], output: [filename, recorder], coverage: true });
-            expect(code.lcov).to.equal(0);
-            expect(code.console).to.equal(0);
+            expect(code).to.equal(0);
             expect(output.lcov).to.equal(Fs.readFileSync(filename).toString());
             expect(output.console).to.equal(recorder.content);
             Fs.unlinkSync(filename);
@@ -1908,9 +1907,7 @@ describe('Reporter', () => {
             const filename = Path.join(Os.tmpdir(), [Date.now(), process.pid, Crypto.randomBytes(8).toString('hex')].join('-'));
 
             const { code, output } = await Lab.report(script, { reporter: ['lcov', 'html', 'console'], output: [filename, htmlRecorder, consoleRecorder], coverage: true, coveragePath: Path.join(__dirname, './coverage/basic.js') });
-            expect(code.console).to.equal(1);
-            expect(code.lcov).to.equal(1);
-            expect(code.html).to.equal(1);
+            expect(code).to.equal(1);
             expect(output.lcov).to.equal(Fs.readFileSync(filename).toString());
             expect(output.html).to.equal(htmlRecorder.content);
             expect(consoleRecorder.content).to.contain('Coverage: 100.00%');
@@ -1982,8 +1979,7 @@ describe('Reporter', () => {
 
             const { code, output } = await Lab.report(script, { reporter: ['console', 'console'], output: [filename, recorder], coverage: true });
 
-            expect(code.console).to.equal(0);
-            expect(code.console2).to.equal(0);
+            expect(code).to.equal(0);
             expect(output.console).to.equal(Fs.readFileSync(filename).toString());
             expect(output.console2).to.equal(recorder.content);
             Fs.unlinkSync(filename);