diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-07 21:35:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-07 21:35:08 +0000 |
| commit | 0ec914544fe9c8de6a7c83e37011063926e2f9b5 (patch) | |
| tree | 61dd47e79cb17c9c37e988bc5ecf20743e9a7150 | |
| parent | c88997df7f6bfc3f4ce7b7d255214aaab81d8d7e (diff) | |
| parent | ee99bf3c4e0de68e0c217ab5c0a4e5d503f70dc9 (diff) | |
| download | gitlab-ce-0ec914544fe9c8de6a7c83e37011063926e2f9b5.tar.gz | |
Merge branch 'revert-135b4f75' into 'master'
Revert "Merge branch 'fix-karma-coverage' into 'master'"
See merge request !9051
| -rw-r--r-- | config/karma.config.js | 10 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 59b95427dbc..44229e2ee88 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -13,17 +13,9 @@ module.exports = function(config) { { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)', included: false }, ], preprocessors: { - 'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap', 'coverage'], + 'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'], }, - 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 c4206eabad1..9581d966237 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "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", |