Commit abdb0d36 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'leipert-fix-karma-parsing' into 'master'

Fix karma junit result formatter

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