refactor: refactor before call

sifrr · Jun 13, 2019 · 64ef3a8 · 64ef3a8
1 parent c7125c0
commit 64ef3a8
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/dist/sifrr.dev.js b/dist/sifrr.dev.js
diff --git a/dist/sifrr.dev.js.map b/dist/sifrr.dev.js.map
diff --git a/dist/sifrr.dev.min.js b/dist/sifrr.dev.min.js
diff --git a/dist/sifrr.dev.module.js b/dist/sifrr.dev.module.js
diff --git a/dist/sifrr.dev.module.js.map b/dist/sifrr.dev.module.js.map
diff --git a/src/test/run.js b/src/test/run.js
@@ -60,11 +60,15 @@ async function runTests(options = {}) {
     junitXmlFile = path.join(root, `./test-results/${path.basename(root)}/results.xml`),
     inspect = false,
     reporters = ['html'],
-    mochaOptions = {}
+    mochaOptions = {},
+    before
   } = options;
 
   if (inspect) require('inspector').open(undefined, undefined, true);
 
+  const beforeRet = typeof before === 'function' ? before() : false;
+  if (beforeRet instanceof Promise) await beforeRet;
+
   const allFolders = deepMerge({
     unitTest: path.join(root, './test/unit'),
     browserTest: path.join(root, './test/browser'),
@@ -133,7 +137,7 @@ async function runTests(options = {}) {
 
       if (global.__pdescribes) {
         const fs = await Promise.all(global.__pdescribes);
-        failures += fs.reduce((a, b) => a + b);
+        failures += fs.reduce((a, b) => a + b, 0);
       }
 
       // Get and write code coverage
@@ -151,8 +155,6 @@ async function runTests(options = {}) {
 
 process.on('message', async (options) => {
   options = JsonFn.parse(options);
-  const before = typeof options.before === 'function' ? options.before() : false;
-  if (before instanceof Promise) await before;
 
   await runTests(options).catch(f => {
     if (Number(f)) process.send(`${f}`);

diff --git a/src/test/testglobals.js b/src/test/testglobals.js
@@ -22,7 +22,7 @@ function getCaller() {
 }
 
 module.exports = (mochaOptions) => {
-  global.__pdescribes = [Promise.resolve(0)];
+  global.__pdescribes = [];
   global.ENV = process.env.NODE_ENV = process.env.NODE_ENV || 'test';
   global.Mocha = require('mocha');
   global.chai = require('chai');