test actually checks rootHooks behavior

mochajs · Apr 8, 2020 · 0d04957 · 0d04957
1 parent a7dc33c
commit 0d04957
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 21 deletions.
diff --git a/lib/mocha.js b/lib/mocha.js
@@ -134,14 +134,17 @@ function Mocha(options) {
     'fullTrace',
     'growl',
     'inlineDiffs',
-    'invert',
-    'rootHooks'
+    'invert'
   ].forEach(function(opt) {
     if (options[opt]) {
       this[opt]();
     }
   }, this);
 
+  if (options.rootHooks) {
+    this.rootHooks(options.rootHooks);
+  }
+
   if (options.parallel) {
     this._runner = require('./buffered-runner');
     this.lazyLoadFiles = true;

diff --git a/lib/worker.js b/lib/worker.js
@@ -36,7 +36,6 @@ let bootstrap = argv => {
     /* istanbul ignore next */
     debug('exiting');
   });
-  debug('bootstrapped');
   bootstrap = () => {};
 };
 
@@ -67,7 +66,7 @@ async function run(filepath, argv = {ui: 'bdd'}) {
 
   bootstrap(opts);
 
-  opts.rootHooks = opts.rootHooks || rootHooks;
+  opts.rootHooks = rootHooks;
 
   const mocha = new Mocha(opts).addFile(filepath);
 
@@ -86,7 +85,10 @@ async function run(filepath, argv = {ui: 'bdd'}) {
       // Runner adds these; if we don't remove them, we'll get a leak.
       process.removeAllListeners('uncaughtException');
 
-      debug('completed run with %d test failures', result.failures);
+      debug(
+        'completed run with %d test failures',
+        typeof result.failures === 'number' ? result.failures : 0
+      );
       try {
         const serialized = serialize(result);
         debug('returning to main process');

diff --git a/test/integration/options/require.spec.js b/test/integration/options/require.spec.js
@@ -3,21 +3,58 @@
 var invokeMochaAsync = require('../helpers').invokeMochaAsync;
 
 describe('--require', function() {
-  it('should allow registration of root hooks', function() {
-    return expect(
-      invokeMochaAsync([
-        '--require',
-        require.resolve(
-          '../fixtures/options/require/root-hook-defs-a.fixture.js'
-        ),
-        '--require',
-        require.resolve(
-          '../fixtures/options/require/root-hook-defs-b.fixture.js'
-        ),
-        require.resolve('../fixtures/options/require/root-hook-test.fixture.js')
-      ])[1],
-      'when fulfilled',
-      'to have succeeded'
-    );
+  describe('when run in serial', function() {
+    it('should allow registration of root hooks', function() {
+      return expect(
+        invokeMochaAsync([
+          '--require=' +
+            require.resolve(
+              '../fixtures/options/require/root-hook-defs-a.fixture.js'
+            ),
+          '--require=' +
+            require.resolve(
+              '../fixtures/options/require/root-hook-defs-b.fixture.js'
+            ),
+          require.resolve(
+            '../fixtures/options/require/root-hook-test.fixture.js'
+          )
+        ])[1],
+        'when fulfilled',
+        'to contain output',
+        /beforeAll\nbeforeAll array 1\nbeforeAll array 2\nbeforeEach\nbeforeEach array 1\nbeforeEach array 2\n/
+      ).and(
+        'when fulfilled',
+        'to contain output',
+        /afterEach\nafterEach array 1\nafterEach array 2\nafterAll\nafterAll array 1\nafterAll array 2\n/
+      );
+    });
+  });
+
+  describe('when run with --parallel', function() {
+    it('should allow registration of root hooks', function() {
+      return expect(
+        invokeMochaAsync([
+          '--require=' +
+            require.resolve(
+              '../fixtures/options/require/root-hook-defs-a.fixture.js'
+            ),
+          '--require=' +
+            require.resolve(
+              '../fixtures/options/require/root-hook-defs-b.fixture.js'
+            ),
+          '--parallel',
+          require.resolve(
+            '../fixtures/options/require/root-hook-test.fixture.js'
+          )
+        ])[1],
+        'when fulfilled',
+        'to contain output',
+        /beforeAll\nbeforeAll array 1\nbeforeAll array 2\nbeforeEach\nbeforeEach array 1\nbeforeEach array 2\n/
+      ).and(
+        'when fulfilled',
+        'to contain output',
+        /afterEach\nafterEach array 1\nafterEach array 2\nafterAll\nafterAll array 1\nafterAll array 2\n/
+      );
+    });
   });
 });