Commit ad789b7f authored by Filipa Lacerda's avatar Filipa Lacerda

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
parents f396ebe4 618902d2
...@@ -112,13 +112,13 @@ module.exports = function(config) { ...@@ -112,13 +112,13 @@ module.exports = function(config) {
preprocessors: { preprocessors: {
'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'],
}, },
reporters: ['progress'], reporters: ['mocha'],
webpack: webpackConfig, webpack: webpackConfig,
webpackMiddleware: { stats: 'errors-only' }, webpackMiddleware: { stats: 'errors-only' },
}; };
if (process.env.CI) { if (process.env.CI) {
karmaConfig.reporters = ['mocha', 'junit']; karmaConfig.reporters.push('junit');
karmaConfig.junitReporter = { karmaConfig.junitReporter = {
outputFile: 'junit_karma.xml', outputFile: 'junit_karma.xml',
useBrowserName: false, useBrowserName: false,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment