From aa12d4cd0cd6638329d116d4fd980b01186ca46d Mon Sep 17 00:00:00 2001
From: Victor Turansky <victor.turansky@gmail.com>
Date: Sat, 4 Apr 2020 20:25:21 +0300
Subject: [PATCH] [Gradle, JS] Karma configuration. Remove launcher duplication

---
 .../targets/js/testing/karma/KotlinKarma.kt   | 67 ++++++-------------
 1 file changed, 19 insertions(+), 48 deletions(-)

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 7f1a7b24cad..29a46c80263 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
@@ -93,47 +93,19 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
         configDirectory = dir
     }
 
-    fun useChrome() {
-        useBrowser(
-            id = "Chrome",
-            dependency = versions.karmaChromeLauncher
-        )
-    }
+    private fun useChromeLike(id: String) = useBrowser(id, versions.karmaChromeLauncher)
 
-    fun useChromeHeadless() {
-        useBrowser(
-            id = "ChromeHeadless",
-            dependency = versions.karmaChromeLauncher
-        )
-    }
+    fun useChrome() = useChromeLike("Chrome")
 
-    fun useChromium() {
-        useBrowser(
-            id = "Chromium",
-            dependency = versions.karmaChromeLauncher
-        )
-    }
+    fun useChromeHeadless() = useChromeLike("ChromeHeadless")
 
-    fun useChromiumHeadless() {
-        useBrowser(
-            id = "ChromiumHeadless",
-            dependency = versions.karmaChromeLauncher
-        )
-    }
+    fun useChromium() = useChromeLike("Chromium")
 
-    fun useChromeCanary() {
-        useBrowser(
-            id = "ChromeCanary",
-            dependency = versions.karmaChromeLauncher
-        )
-    }
+    fun useChromiumHeadless() = useChromeLike("ChromiumHeadless")
 
-    fun useChromeCanaryHeadless() {
-        useBrowser(
-            id = "ChromeCanaryHeadless",
-            dependency = versions.karmaChromeLauncher
-        )
-    }
+    fun useChromeCanary() = useChromeLike("ChromeCanary")
+
+    fun useChromeCanaryHeadless() = useChromeLike("ChromeCanaryHeadless")
 
     fun useDebuggableChrome() {
         val debuggableChrome = "DebuggableChrome"
@@ -142,29 +114,28 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
             flags.add("--remote-debugging-port=9222")
         }
 
-        useBrowser(
-            id = debuggableChrome,
-            dependency = versions.karmaChromeLauncher
-        )
+        useChromeLike(debuggableChrome)
     }
 
     fun usePhantomJS() = useBrowser("PhantomJS", versions.karmaPhantomJsLauncher)
 
-    fun useFirefox() = useBrowser("Firefox", versions.karmaFirefoxLauncher)
+    private fun useFirefoxLike(id: String) = useBrowser(id, versions.karmaFirefoxLauncher)
 
-    fun useFirefoxHeadless() = useBrowser("FirefoxHeadless", versions.karmaFirefoxLauncher)
+    fun useFirefox() = useFirefoxLike("Firefox")
 
-    fun useFirefoxDeveloper() = useBrowser("FirefoxDeveloper", versions.karmaFirefoxLauncher)
+    fun useFirefoxHeadless() = useFirefoxLike("FirefoxHeadless")
 
-    fun useFirefoxDeveloperHeadless() = useBrowser("FirefoxDeveloperHeadless", versions.karmaFirefoxLauncher)
+    fun useFirefoxDeveloper() = useFirefoxLike("FirefoxDeveloper")
 
-    fun useFirefoxAurora() = useBrowser("FirefoxAurora", versions.karmaFirefoxLauncher)
+    fun useFirefoxDeveloperHeadless() = useFirefoxLike("FirefoxDeveloperHeadless")
 
-    fun useFirefoxAuroraHeadless() = useBrowser("FirefoxAuroraHeadless", versions.karmaFirefoxLauncher)
+    fun useFirefoxAurora() = useFirefoxLike("FirefoxAurora")
 
-    fun useFirefoxNightly() = useBrowser("FirefoxNightly", versions.karmaFirefoxLauncher)
+    fun useFirefoxAuroraHeadless() = useFirefoxLike("FirefoxAuroraHeadless")
 
-    fun useFirefoxNightlyHeadless() = useBrowser("FirefoxNightlyHeadless", versions.karmaFirefoxLauncher)
+    fun useFirefoxNightly() = useFirefoxLike("FirefoxNightly")
+
+    fun useFirefoxNightlyHeadless() = useFirefoxLike("FirefoxNightlyHeadless")
 
     fun useOpera() = useBrowser("Opera", versions.karmaOperaLauncher)