aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2021-02-16 12:18:06 +0200
committerGitHub <[email protected]>2021-02-16 12:18:06 +0200
commit324107f3af726da14a935fd3b0e2387919f2c38d (patch)
tree9feef4d240d055f3e01d4230e4ea29e45690f660
parent92434fa30f38178ba6fd8f3a7d66828eec0783e0 (diff)
downloadbootstrap-324107f3af726da14a935fd3b0e2387919f2c38d.tar.xz
bootstrap-324107f3af726da14a935fd3b0e2387919f2c38d.zip
Simplify karma.conf.js (#33045)
`customLaunchers` does not seem to be needed.
-rw-r--r--js/tests/karma.conf.js16
1 files changed, 6 insertions, 10 deletions
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index cd4946525..c13413449 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -33,7 +33,12 @@ const reporters = ['dots']
const detectBrowsers = {
usePhantomJS: false,
postDetection(availableBrowser) {
- if (ENV.CI === true || availableBrowser.includes('Chrome')) {
+ // On CI just use Chrome
+ if (ENV.CI === true) {
+ return ['ChromeHeadless']
+ }
+
+ if (availableBrowser.includes('Chrome')) {
return DEBUG ? ['Chrome'] : ['ChromeHeadless']
}
@@ -49,13 +54,6 @@ const detectBrowsers = {
}
}
-const customLaunchers = {
- FirefoxHeadless: {
- base: 'Firefox',
- flags: ['-headless']
- }
-}
-
const conf = {
basePath: '../..',
port: 9876,
@@ -124,7 +122,6 @@ if (BROWSERSTACK) {
'karma-firefox-launcher',
'karma-detect-browsers'
)
- conf.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers
conf.files = [
'node_modules/jquery/dist/jquery.slim.min.js',
@@ -142,7 +139,6 @@ if (BROWSERSTACK) {
'karma-coverage-istanbul-reporter'
)
reporters.push('coverage-istanbul')
- conf.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers
conf.coverageIstanbulReporter = {
dir: path.resolve(__dirname, '../coverage/'),