fix(middleware): read bail value from the util module

japa · Apr 1, 2017 · f24d2d7 · f24d2d7
1 parent 6ce1d59
commit f24d2d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/Group.js b/src/Group.js
@@ -20,15 +20,14 @@ class Group {
   constructor (title, isRoot) {
     this._title = title
     this._isRoot = !!isRoot
-    this._timeout = $.getTimeout()
     this._hooks = {
       beforeEach: [],
       afterEach: [],
       before: [],
       after: []
     }
     this._tests = []
-    this.middleware = new Middleware(this, $.getBail(), this._wrapFn)
+    this.middleware = new Middleware(this, this._wrapFn)
   }
 
   /**

diff --git a/src/Middleware.js b/src/Middleware.js
@@ -9,11 +9,13 @@
  * file that was distributed with this source code.
 */
 
+const $ = require('../lib/util')
+
 class Middleware {
 
-  constructor (context, bail, fnWrapper) {
+  constructor (context, fnWrapper) {
     this._context = context
-    this._bail = !!bail
+    this._bail = $.getBail()
     this._fnWrapper = fnWrapper
     this._stack = []
     this.errorsStack = []

diff --git a/src/Runner.js b/src/Runner.js
@@ -225,7 +225,7 @@ class Runner {
     }
 
     return new Promise((resolve, reject) => {
-      const middleware = new Middleware(this, $.getBail(), this._wrapFn)
+      const middleware = new Middleware(this, this._wrapFn)
       this._start()
       middleware.compose(this._testGroups)()
       .then(() => {