Commit e90ec73f authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch 'beautiful-karma-output' into 'master'

Make Karma output look nicer for CI

See merge request !9165
parents b05e75b8 19cb1fcd
---
title: Make Karma output look nicer for CI
merge_request: 9165
author: winniehell
...@@ -4,6 +4,7 @@ var ROOT_PATH = path.resolve(__dirname, '..'); ...@@ -4,6 +4,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
// Karma configuration // Karma configuration
module.exports = function(config) { module.exports = function(config) {
var progressReporter = process.env.CI ? 'mocha' : 'progress';
config.set({ config.set({
basePath: ROOT_PATH, basePath: ROOT_PATH,
browsers: ['PhantomJS'], browsers: ['PhantomJS'],
...@@ -15,7 +16,7 @@ module.exports = function(config) { ...@@ -15,7 +16,7 @@ module.exports = function(config) {
preprocessors: { preprocessors: {
'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'], 'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'],
}, },
reporters: ['progress', 'coverage-istanbul'], reporters: [progressReporter, 'coverage-istanbul'],
coverageIstanbulReporter: { coverageIstanbulReporter: {
reports: ['html', 'text-summary'], reports: ['html', 'text-summary'],
dir: 'coverage-javascript/', dir: 'coverage-javascript/',
......
This diff is collapsed.
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