Skip instead of abort

hapijs · Jan 18, 2017 · ae23bc4 · ae23bc4
1 parent c074671
commit ae23bc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -327,10 +327,6 @@ internals.executeExperiments = function (experiments, state, skip, callback) {
                 state.report.errors.push(err);
             }
 
-            if (state.report.errors.length && state.options.bail === true) {
-                return callback();
-            }
-
             nextExperiment();
         });
     },
@@ -361,10 +357,6 @@ internals.executeTests = function (experiment, state, skip, callback) {
         return callback();
     }
 
-    // Set to an error when options.bail is set and a test fails
-
-    let bail = null;
-
     // Collect beforeEach and afterEach from parents
 
     const befores = skip ? [] : internals.collectDeps(experiment, 'beforeEaches');
@@ -398,7 +390,7 @@ internals.executeTests = function (experiment, state, skip, callback) {
             return nextTest();
         }
 
-        const skipTest = skip || test.options.skip;
+        const skipTest = skip || test.options.skip || (state.options.bail && state.report.failures);
 
         const steps = [
             function (next) {
@@ -439,7 +431,6 @@ internals.executeTests = function (experiment, state, skip, callback) {
                         state.report.failures++;
                         test.err = err;
                         test.timeout = err.timeout;
-                        bail = state.options.bail === true ? err : null;
                     }
 
                     test.duration = Date.now() - start;
@@ -472,10 +463,6 @@ internals.executeTests = function (experiment, state, skip, callback) {
                 state.report.errors.push(err);
             }
 
-            if (bail) {
-                return callback(bail);
-            }
-
             return nextTest();
         });
     };

diff --git a/test/runner.js b/test/runner.js
@@ -810,9 +810,10 @@ describe('Runner', () => {
         Lab.execute(script, { bail: true }, null, (err, notebook) => {
 
             expect(err).not.to.exist();
-            expect(notebook.tests).to.have.length(2);
+            expect(notebook.tests).to.have.length(3);
             expect(notebook.failures).to.equal(1);
-            expect(notebook.errors[0].message).to.contain('bailing');
+            expect(notebook.tests[1].err.message).to.contain('bailing');
+            expect(notebook.tests[2].skipped).to.be.true();
             done();
         });
     });