summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/karma.config.js2
-rw-r--r--spec/javascripts/test_bundle.js5
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);