Commit 835733a0 authored by Lukas Eipert's avatar Lukas Eipert

Fix karma junit reports on CI

parent 18b99cca
...@@ -84,7 +84,7 @@ module.exports = function(config) { ...@@ -84,7 +84,7 @@ module.exports = function(config) {
basePath: ROOT_PATH, basePath: ROOT_PATH,
browsers: ['ChromeHeadlessCustom'], browsers: ['ChromeHeadlessCustom'],
client: { client: {
isCI: !!process.env.CI color: !process.env.CI
}, },
customLaunchers: { customLaunchers: {
ChromeHeadlessCustom: { ChromeHeadlessCustom: {
......
/* eslint-disable /* eslint-disable
jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle, no-console jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle, no-console
*/ */
/* global __karma__ */
import $ from 'jquery'; import $ from 'jquery';
import 'vendor/jasmine-jquery'; import 'vendor/jasmine-jquery';
...@@ -42,8 +41,8 @@ jasmine.getJSONFixtures().fixturesPath = FIXTURES_PATH; ...@@ -42,8 +41,8 @@ jasmine.getJSONFixtures().fixturesPath = FIXTURES_PATH;
beforeAll(() => { beforeAll(() => {
jasmine.addMatchers( jasmine.addMatchers(
jasmineDiff(jasmine, { jasmineDiff(jasmine, {
colors: !__karma__.config.isCi, colors: window.__karma__.config.color,
inline: !__karma__.config.isCi, inline: window.__karma__.config.color,
}), }),
); );
jasmine.addMatchers(customMatchers); jasmine.addMatchers(customMatchers);
......
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