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

Fix karma junit result formatter

See merge request gitlab-org/gitlab-ce!21744

config/karma.config.js

@@ -84,7 +84,7 @@ module.exports = function(config) {
     basePath: ROOT_PATH,
     browsers: ['ChromeHeadlessCustom'],
     client: {
-      isCI: !!process.env.CI
+      color: !process.env.CI
     },
     customLaunchers: {
       ChromeHeadlessCustom: {

spec/javascripts/test_bundle.js

 /* 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);