fixup! Support reporting coverage for tests

enb · Nov 18, 2014 · 42c6bdd · 42c6bdd
1 parent a4dbf9e
commit 42c6bdd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/lib/coverage-object.js b/lib/coverage-object.js
@@ -1,14 +1,14 @@
-var _ = require('lodash');
+var _ = require('lodash'),
+    inherit = require('inherit');
 
-function CoverageObject() {
-    this._indices = {
-    };
-    this.coverage = {
-    };
-}
+module.exports = inherit({
+    __constructor: function() {
+        this._indices = {
+        };
+        this.coverage = {
+        };
 
-CoverageObject.prototype = {
-    constructor: CoverageObject,
+    },
 
     addStatement: function (start, end, counter) {
         var sourceName = start.source,
@@ -75,11 +75,8 @@ CoverageObject.prototype = {
         }
         return fileObject;
     }
-
-};
+});
 
 function getLocation(soureMapLocation) {
     return _.pick(soureMapLocation, 'line', 'column');
 }
-
-module.exports = CoverageObject;
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -60,7 +60,6 @@ module.exports = function (helper) {
                 sourceLevels: options.sourceLevels || options.levels,
                 coverage: _.defaults(options.coverage || {}, {
                     engines: [],
-                    hasSourceMap: false,
                     reportDirectory: 'tmpl-coverage',
                     exclude: [
                         '**/node_modules/**',

diff --git a/lib/runner.js b/lib/runner.js
@@ -66,10 +66,6 @@ function getReporters() {
 function processCoverage(coverageOpts) {
     var coverage = global.__coverage__;
 
-    if (!coverageOpts.hasSourceMap) {
-        return filterAndSaveCoverage(coverage, coverageOpts);
-    }
-
     return unmapCoverageObject(coverage)
         .then(function (unmapedCoverage) {
             return filterAndSaveCoverage(unmapedCoverage, coverageOpts);

diff --git a/lib/unmap-coverage.js b/lib/unmap-coverage.js
@@ -17,9 +17,15 @@ function unmapCoverageObject(sourceObject) {
             return coverageObjects.reduce(istanbul.utils.mergeFileCoverage);
         })
         .then(function (totalCoverage) {
-            return _.omit(totalCoverage, function (value, fileName) {
+            var withNoSources = _.omit(totalCoverage, function (value, fileName) {
                 return fileName in sourceObject;
             });
+            if (_.isEmpty(withNoSources)) {
+                // if no sources left after removal of originals,
+                // source map is absent
+                return totalCoverage;
+            }
+            return withNoSources;
         });
 }