summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorwinniehell <git@winniehell.de>2017-02-10 19:29:03 +0100
committerwinniehell <git@winniehell.de>2017-02-11 21:55:02 +0100
commitb48d30e4d27d2482f5517fc58751953d32f0ded6 (patch)
tree84aabcc093717fc23a704bb15516512592b4ee30 /config
parent8a1441fb025bf9f46d42017e069382a44ade28d0 (diff)
downloadgitlab-ce-b48d30e4d27d2482f5517fc58751953d32f0ded6.tar.gz
Reintroduce coverage report for JavaScript (!9133)
Diffstat (limited to 'config')
-rw-r--r--config/karma.config.js7
-rw-r--r--config/webpack.config.js1
2 files changed, 8 insertions, 0 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index 44229e2ee88..a1fbeab1f46 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -15,6 +15,13 @@ module.exports = function(config) {
preprocessors: {
'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'],
},
+ reporters: ['progress', 'coverage-istanbul'],
+ coverageIstanbulReporter: {
+ reports: ['html', 'text-summary'],
+ dir: 'coverage-javascript/',
+ subdir: '.',
+ fixWebpackSourcePaths: true
+ },
webpack: webpackConfig,
webpackMiddleware: { stats: 'errors-only' },
});
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 00f448c1fbb..e800cc3fd84 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -54,6 +54,7 @@ var config = {
exclude: /(node_modules|vendor\/assets)/,
loader: 'babel-loader',
options: {
+ plugins: ['istanbul'],
presets: [
["es2015", {"modules": false}],
'stage-2'