Combine browser and node coverage reports

karma.conf.js

@@ -11,10 +11,9 @@ module.exports = function (config) {
  if (runCoverage) {
  coverageLoaders.push({
  test: /\.js$/,
- include: path.resolve('modules/'),
- exclude: /__tests__/,
+ include: path.resolve('src/'),
  loader: 'isparta'
- })
+ }),
 
  coverageReporters.push('coverage');
  }
@@ -42,17 +41,11 @@ module.exports = function (config) {
  {
  test: /\.js$/,
  exclude: [
- path.resolve('src/'),
  path.resolve('node_modules/')
  ],
  loader: 'babel'
  },
- {
- test: /\.js$/,
- include: path.resolve('src/'),
- loader: 'isparta'
- }
- ]
+ ].concat(coverageLoaders)
  }
  },
 
@@ -63,7 +56,7 @@ module.exports = function (config) {
  coverageReporter: {
  reporters: [
  { type: 'text' },
- { type: 'html', subdir: 'html' }
+ { type: 'json', subdir: 'browser-coverage', file: 'coverage.json' }
  ]
  }
  });

package.json

@@ -15,7 +15,10 @@
  "build": "mkdir -p lib && babel ./src/index.js --out-file ./lib/index.js",
  "test": "mocha --compilers js:babel-core/register --recursive",
  "test:browser": "karma start",
- "test:cov": "babel-node $(npm bin)/isparta cover $(npm bin)/_mocha -- --recursive",
+ "test:cov": "npm run test:cov:browser && npm run test:cov:node && npm run test:cov:report",
+ "test:cov:node": "babel-node $(npm bin)/isparta cover $(npm bin)/_mocha report --dir ./coverage/node-coverage -- --recursive",
+ "test:cov:browser": "COVERAGE=true karma start",
+ "test:cov:report": "$(npm bin)/istanbul report --dir ./coverage --include **/*coverage.json html text",
  "prepublish": "npm run build"
  },
  "tags": [