diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-07 19:30:24 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-07 19:30:24 +0000 |
| commit | 135b4f75d292070cde6576038f3116ff56aa1092 (patch) | |
| tree | f7524faebe0454292a2597dc7ac0fbc899e624f4 | |
| parent | 58eae0961ea6e2147a288cda8a56a51303bbf13b (diff) | |
| parent | fbdf54bdcf192fb12a17c06ac74b79c815911e1d (diff) | |
| download | gitlab-ce-135b4f75d292070cde6576038f3116ff56aa1092.tar.gz | |
Merge branch 'fix-karma-coverage' into 'master'
Fix javascript coverage reports
See merge request !9044
| -rw-r--r-- | config/karma.config.js | 10 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 44229e2ee88..59b95427dbc 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -13,9 +13,17 @@ module.exports = function(config) { { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)', included: false }, ], preprocessors: { - 'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'], + 'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap', 'coverage'], }, + reporters: ['progress', 'coverage'], webpack: webpackConfig, webpackMiddleware: { stats: 'errors-only' }, + coverageReporter: { + dir: './coverage-javascript', + reporters: [ + { type: 'html', subdir: 'default' }, + { type: 'text-summary' } + ], + } }); }; diff --git a/package.json b/package.json index 9581d966237..c4206eabad1 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "jasmine-core": "^2.5.2", "jasmine-jquery": "^2.1.1", "karma": "^1.3.0", + "karma-coverage": "^1.1.1", "karma-jasmine": "^1.1.0", "karma-phantomjs-launcher": "^1.0.2", "karma-sourcemap-loader": "^0.3.7", |