chore: fix coverage in unit tests

sifrr · Jun 3, 2019 · 6e035a3 · 6e035a3
1 parent be80009
commit 6e035a3
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 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.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/scripts/test/run.js b/scripts/test/run.js
@@ -1,11 +1,20 @@
 const path = require('path');
 
-// check if should inspect or not
-const inspect = process.argv.indexOf('-i') > 0 || process.argv.indexOf('--inspect') > 0;
-
 // Check if need coverage
 const coverage = process.env.COVERAGE === 'true';
 
+// coverage for require
+if (coverage) {
+  const { createInstrumenter } = require('istanbul-lib-instrument');
+  const instrumenter = createInstrumenter();
+  const { hookRequire } = require('istanbul-lib-hook');
+  hookRequire((filePath) => filePath.match(/\/src/), (code, { filename }) => instrumenter.instrumentSync(code, filename));
+  global.cov = true;
+}
+
+// check if should inspect or not
+const inspect = process.argv.indexOf('-i') > 0 || process.argv.indexOf('--inspect') > 0;
+
 // check if need junit reporter
 const useJunitReporter = process.argv.indexOf('-j') > 0 || process.argv.indexOf('--junit') > 0;
 

diff --git a/src/test/loadbrowser.js b/src/test/loadbrowser.js
@@ -23,6 +23,7 @@ module.exports = async function(root, coverage) {
 
   function setPageGoto(page) {
     page.goto = async (url, options) => {
+      /* istanbul ignore next */
       const jsCoverage = await page.evaluate(() => window.__coverage__);
       writeCoverage(jsCoverage, path.join(nycReport, `./${Date.now()}-browser-coverage.json`));
       const ret = page.mainFrame().goto(url, options);
@@ -39,6 +40,7 @@ module.exports = async function(root, coverage) {
 
     browser.__close = browser.close;
     browser.close = async () => {
+      /* istanbul ignore next */
       const jsCoverage = await page.evaluate(() => window.__coverage__);
       writeCoverage(jsCoverage, path.join(nycReport, `./${Date.now()}-browser-coverage.json`));
       return browser.__close();

diff --git a/src/test/run.js b/src/test/run.js
@@ -68,11 +68,12 @@ module.exports = async function({
   }
   if (setGlobals) testGlobals();
 
-  if (coverage) {
+  if (coverage && !global.cov) {
     const { createInstrumenter } = require('istanbul-lib-instrument');
     const instrumenter = createInstrumenter();
     const { hookRequire } = require('istanbul-lib-hook');
-    hookRequire((filePath) => filePath.match(/\/src/), (code, { filename }) => instrumenter.instrumentSync(code, filename));
+    hookRequire((filePath) => filePath.indexOf(root + 'src') > -1, (code, { filename }) => instrumenter.instrumentSync(code, filename));
+    global.cov = true;
   }
 
   const mochaOptions = {