From 187ab5f393e54228a513e9a04dbd97b538914b8b Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 3 Apr 2020 12:32:59 +0300
Subject: [PATCH] [Gradle, JS] KT-37984 Add additional Chrome and Firefox based
 browsers

#KT-37984 fixed
---
 .../kotlin/gradle/targets/js/NpmVersions.kt   |  2 +-
 .../targets/js/testing/karma/KotlinKarma.kt   | 55 ++++++++++++++-----
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
index 9496041e121..5d3d719b877 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt
@@ -32,7 +32,7 @@ class NpmVersions {
 
     val karmaChromeLauncher = NpmPackageVersion("karma-chrome-launcher", "3.1.0")
     val karmaPhantomJsLauncher = NpmPackageVersion("karma-phantomjs-launcher", "1.0.4")
-    val karmaFirefoxLauncher = NpmPackageVersion("karma-firefox-launcher", "1.2.0")
+    val karmaFirefoxLauncher = NpmPackageVersion("karma-firefox-launcher", "1.3.0")
     val karmaOperaLauncher = NpmPackageVersion("karma-opera-launcher", "1.0.0")
     val karmaIeLauncher = NpmPackageVersion("karma-ie-launcher", "1.0.0")
     val karmaSafariLauncher = NpmPackageVersion("karma-safari-launcher", "1.0.0")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
index e1fdc6b1f67..7f1a7b24cad 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
@@ -100,6 +100,27 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
         )
     }
 
+    fun useChromeHeadless() {
+        useBrowser(
+            id = "ChromeHeadless",
+            dependency = versions.karmaChromeLauncher
+        )
+    }
+
+    fun useChromium() {
+        useBrowser(
+            id = "Chromium",
+            dependency = versions.karmaChromeLauncher
+        )
+    }
+
+    fun useChromiumHeadless() {
+        useBrowser(
+            id = "ChromiumHeadless",
+            dependency = versions.karmaChromeLauncher
+        )
+    }
+
     fun useChromeCanary() {
         useBrowser(
             id = "ChromeCanary",
@@ -107,6 +128,13 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
         )
     }
 
+    fun useChromeCanaryHeadless() {
+        useBrowser(
+            id = "ChromeCanaryHeadless",
+            dependency = versions.karmaChromeLauncher
+        )
+    }
+
     fun useDebuggableChrome() {
         val debuggableChrome = "DebuggableChrome"
 
@@ -120,17 +148,24 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
         )
     }
 
-    fun useChromeHeadless() {
-        useBrowser(
-            id = "ChromeHeadless",
-            dependency = versions.karmaChromeLauncher
-        )
-    }
-
     fun usePhantomJS() = useBrowser("PhantomJS", versions.karmaPhantomJsLauncher)
 
     fun useFirefox() = useBrowser("Firefox", versions.karmaFirefoxLauncher)
 
+    fun useFirefoxHeadless() = useBrowser("FirefoxHeadless", versions.karmaFirefoxLauncher)
+
+    fun useFirefoxDeveloper() = useBrowser("FirefoxDeveloper", versions.karmaFirefoxLauncher)
+
+    fun useFirefoxDeveloperHeadless() = useBrowser("FirefoxDeveloperHeadless", versions.karmaFirefoxLauncher)
+
+    fun useFirefoxAurora() = useBrowser("FirefoxAurora", versions.karmaFirefoxLauncher)
+
+    fun useFirefoxAuroraHeadless() = useBrowser("FirefoxAuroraHeadless", versions.karmaFirefoxLauncher)
+
+    fun useFirefoxNightly() = useBrowser("FirefoxNightly", versions.karmaFirefoxLauncher)
+
+    fun useFirefoxNightlyHeadless() = useBrowser("FirefoxNightlyHeadless", versions.karmaFirefoxLauncher)
+
     fun useOpera() = useBrowser("Opera", versions.karmaOperaLauncher)
 
     fun useSafari() = useBrowser("Safari", versions.karmaSafariLauncher)
@@ -338,7 +373,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
 
         val karmaConfJs = npmProject.dir.resolve("karma.conf.js")
         karmaConfJs.printWriter().use { confWriter ->
-            confWriter.println("// environment variables")
             envJsCollector.forEach { (envVar, value) ->
                 //language=JavaScript 1.8
                 confWriter.println("process.env.$envVar = $value")
@@ -451,9 +485,4 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
         appendConfigsFromDir(configDirectory)
         appendln()
     }
-
-    companion object {
-        const val CHROME_BIN = "CHROME_BIN"
-        const val CHROME_CANARY_BIN = "CHROME_CANARY_BIN"
-    }
 }