From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 16 Feb 2021 10:18:06 +0000 (+0200)
Subject: Simplify karma.conf.js (#33045)
X-Git-Tag: v5.0.0-beta3~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=324107f3af726da14a935fd3b0e2387919f2c38d;p=thirdparty%2Fbootstrap.git

Simplify karma.conf.js (#33045)

`customLaunchers` does not seem to be needed.
---

diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index cd49465255..c13413449d 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/'),