summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorwinniehell <git@winniehell.de>2017-02-11 22:22:22 +0100
committerwinniehell <git@winniehell.de>2017-02-15 15:27:13 +0100
commit19cb1fcdf364a31077a70d8cf2af09d674f32eaa (patch)
tree30b122d716f82c3e30716cacbf5b5885aa79c23e /config
parentb4c00ae43dda8e32061539f3177a4294a706efc9 (diff)
downloadgitlab-ce-19cb1fcdf364a31077a70d8cf2af09d674f32eaa.tar.gz
Make Karma output look nicer for CI (!9165)
Diffstat (limited to 'config')
-rw-r--r--config/karma.config.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index a1fbeab1f46..5b472780aed 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -4,6 +4,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
// Karma configuration
module.exports = function(config) {
+ var progressReporter = process.env.CI ? 'mocha' : 'progress';
config.set({
basePath: ROOT_PATH,
browsers: ['PhantomJS'],
@@ -15,7 +16,7 @@ module.exports = function(config) {
preprocessors: {
'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'],
},
- reporters: ['progress', 'coverage-istanbul'],
+ reporters: [progressReporter, 'coverage-istanbul'],
coverageIstanbulReporter: {
reports: ['html', 'text-summary'],
dir: 'coverage-javascript/',