diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-11 19:45:27 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-11 19:45:27 +0300 |
| commit | ad789b7f626bad6b00baa6a6fb9793ee7f4cc9f3 (patch) | |
| tree | 31f518d52ef7e1d2bcec23846512f49273f5bd73 | |
| parent | f396ebe451a2f39c4775e4d99df00c9856b80ddc (diff) | |
| parent | 618902d2902f9539a8ac2ada4a2d72faa41fc429 (diff) | |
Merge branch '58716-karma-s-progress-reporter-makes-failing-tests-unclear' into 'master'
Switch to mocha repoter for karma specs
Closes #58716
See merge request gitlab-org/gitlab-ce!25964
| -rw-r--r-- | config/karma.config.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index e1d7c30b1c2..1012a713eb6 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -112,13 +112,13 @@ module.exports = function(config) { preprocessors: { 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], }, - reporters: ['progress'], + reporters: ['mocha'], webpack: webpackConfig, webpackMiddleware: { stats: 'errors-only' }, }; if (process.env.CI) { - karmaConfig.reporters = ['mocha', 'junit']; + karmaConfig.reporters.push('junit'); karmaConfig.junitReporter = { outputFile: 'junit_karma.xml', useBrowserName: false, |