Merge branch 'instrument-in-karma' into 'master'

Move babel config for instanbul to karma config

See merge request !9286

2 files changed, 11 insertions, 1 deletions

diff --git a/config/karma.config.js b/config/karma.config.js
index 5b472780aed..2f3cc932413 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -2,6 +2,17 @@ var path = require('path');
 var webpackConfig = require('./webpack.config.js');
 var ROOT_PATH = path.resolve(__dirname, '..');
 
+// add coverage instrumentation to babel config
+if (webpackConfig && webpackConfig.module && webpackConfig.module.rules) {
+  var babelConfig = webpackConfig.module.rules.find(function (rule) {
+    return rule.loader === 'babel-loader';
+  });
+
+  babelConfig.options = babelConfig.options || {};
+  babelConfig.options.plugins = babelConfig.options.plugins || [];
+  babelConfig.options.plugins.push('istanbul');
+}
+
 // Karma configuration
 module.exports = function(config) {
   var progressReporter = process.env.CI ? 'mocha' : 'progress';
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 8d981c76c1a..01c1a5bfb99 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -55,7 +55,6 @@ var config = {
         exclude: /(node_modules|vendor\/assets)/,
         loader: 'babel-loader',
         options: {
-          plugins: IS_PRODUCTION ? [] : ['istanbul'],
           presets: [
             ["es2015", {"modules": false}],
             'stage-2'