diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-14 15:20:50 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-14 15:20:50 +0000 |
| commit | abdb0d3680a67d175f73eebc99408f42565d8c9c (patch) | |
| tree | 5525d46ae20c1c6bfe9b74bf2947bce77c3dfd0e | |
| parent | 5e81b79101e17cf803069fe30d8a1fdd458adeb9 (diff) | |
| parent | 835733a07031e1d5e2f7e30e5f86c2c54c3018a4 (diff) | |
| download | gitlab-ce-abdb0d3680a67d175f73eebc99408f42565d8c9c.tar.gz | |
Merge branch 'leipert-fix-karma-parsing' into 'master'
Fix karma junit result formatter
See merge request gitlab-org/gitlab-ce!21744
| -rw-r--r-- | config/karma.config.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/test_bundle.js | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index c890c670619..74dc5c13c70 100644 --- a/config/karma.config.js +++ b/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: { diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index b89d10cb993..96c0844f83c 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -1,7 +1,6 @@ /* 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); |