Merge pull request #278 from geek/master

Fix before/after exceptions to be reported

lib/runner.js

@@ -240,7 +240,7 @@ internals.executeDeps = function (deps, state, callback) {
             }, timeout);
         }
 
-        dep.fn.call(null, finish);
+        internals.protect(dep, state, finish);
     }, callback);
 };
 

test/cli.js

@@ -97,6 +97,29 @@ describe('CLI', function () {
         });
     });
 
+    it('exits with code 1 when after function throws', function (done) {
+
+        var cli = ChildProcess.spawn('node', [labPath, 'test/cli_throws/throws.js']);
+        var outData = '';
+        var errData = '';
+
+        cli.stdout.on('data', function (data) {
+
+            outData += data;
+        });
+
+        cli.stderr.on('data', function (data) {
+
+            errData += data;
+        });
+
+        cli.once('close', function (code) {
+
+            expect(code).to.not.equal(0);
+            done();
+        });
+    });
+
     it('shows the help (-h)', function (done) {
 
         var cli = ChildProcess.spawn('node', [labPath,'-h']);

test/cli_throws/throws.js

@@ -0,0 +1,31 @@
+// Load modules
+
+var _Lab = require('../../test_runner');
+
+
+// Declare internals
+
+var internals = {};
+
+
+// Test shortcuts
+
+var lab = exports.lab = _Lab.script();
+var after = lab.after;
+var describe = lab.describe;
+var it = lab.it;
+
+
+describe('Test CLI throws', function () {
+
+    after(function (done) {
+
+        throw new Error('throwing after');
+    });
+
+    it('handles thrown error', function (done) {
+
+        done();
+    });
+});
+