]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Partially backport #33045
authorXhmikosR <xhmikosr@gmail.com>
Tue, 16 Feb 2021 11:12:23 +0000 (13:12 +0200)
committerXhmikosR <xhmikosr@gmail.com>
Wed, 17 Feb 2021 04:54:38 +0000 (06:54 +0200)
Simplify karma.conf.js

`customLaunchers` does not seem to be needed.

js/tests/karma.conf.js

index 94ea91c6c0f39cfdd619006133736ecc1c21bb28..341db24285744bcd190f0a2ea51621b6d43ebd60 100644 (file)
@@ -28,7 +28,12 @@ const reporters = ['dots']
 const detectBrowsers = {
   usePhantomJS: false,
   postDetection(availableBrowser) {
-    if (process.env.CI === true || availableBrowser.includes('Chrome')) {
+    // On CI just use Chrome
+    if (process.env.CI === true) {
+      return ['ChromeHeadless']
+    }
+
+    if (availableBrowser.includes('Chrome')) {
       return ['ChromeHeadless']
     }
 
@@ -44,13 +49,6 @@ const detectBrowsers = {
   }
 }
 
-const customLaunchers = {
-  FirefoxHeadless: {
-    base: 'Firefox',
-    flags: ['-headless']
-  }
-}
-
 let files = [
   'node_modules/popper.js/dist/umd/popper.min.js',
   'node_modules/hammer-simulator/index.js'
@@ -77,7 +75,6 @@ if (BUNDLE) {
     'karma-firefox-launcher',
     'karma-detect-browsers'
   )
-  conf.customLaunchers = customLaunchers
   conf.detectBrowsers = detectBrowsers
   files = [...files,
     JQUERY_FILE,
@@ -114,7 +111,6 @@ if (BUNDLE) {
     'js/coverage/dist/tooltip.js',
     // include all of our js/dist files except util.js, index.js and tooltip.js
     'js/coverage/dist/!(util|index|tooltip).js']
-  conf.customLaunchers = customLaunchers
   conf.detectBrowsers = detectBrowsers
   if (!USE_OLD_JQUERY) {
     plugins.push('karma-coverage-istanbul-reporter')