diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-16 06:51:32 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-16 06:51:32 +0000 |
| commit | e90ec73f651ca6153a72437d4dd01f60c38839da (patch) | |
| tree | f1924bce3cb24ed41c9c00f7f08da34e3ac95434 /config | |
| parent | b05e75b8faccc50749adc63419074c91802a8f50 (diff) | |
| parent | 19cb1fcdf364a31077a70d8cf2af09d674f32eaa (diff) | |
| download | gitlab-ce-e90ec73f651ca6153a72437d4dd01f60c38839da.tar.gz | |
Merge branch 'beautiful-karma-output' into 'master'
Make Karma output look nicer for CI
See merge request !9165
Diffstat (limited to 'config')
| -rw-r--r-- | config/karma.config.js | 3 |
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/', |