Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-02-14 22:40:40 +0300
committerClement Ho <clemmakesapps@gmail.com>2017-02-14 22:40:40 +0300
commit9760fd7a95cb1dcdcee227817e41c924f5d39dc7 (patch)
tree80ffb9d8cc358680f4f6c486ad583c9e288cb270 /config
parentad5e772bddd7b417fa7a36629db02c69b1b9864d (diff)
parentbfb82f8a0d4d837a0472342c05de18c60037a2ea (diff)
Merge branch 'cover-my-karma' into 'master'
Reintroduce coverage report for JavaScript Closes #27826 and #20757 See merge request !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 2ac779c8511..5d5e4bb570a 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'