[Gradle, JS] Disable puppeteer downloading Chrome

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt

@@ -397,23 +397,6 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
         }
     }
 
-    @Test
-    fun testKotlinJsKarmaDownloadChrome() = with(Project("kotlin-js-karma-download-chrome", GradleVersionRequired.AtLeast("4.10.2"))) {
-        setupWorkingDir()
-        gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl)
-        gradleSettingsScript().modify(::transformBuildScriptWithPluginsDsl)
-
-        build("test") {
-            assertTasksExecuted(
-                ":kotlinNpmInstall",
-                ":compileKotlinJs",
-                ":compileTestKotlinJs"
-            )
-
-            assertFileExists("build/js/node_modules/puppeteer/.local-chromium")
-        }
-    }
-
     @Test
     fun testYarnSetup() = with(Project("yarn-setup", GradleVersionRequired.AtLeast("4.10.2"))) {
         setupWorkingDir()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/build.gradle.kts

@@ -1,31 +0,0 @@
-plugins {
-    kotlin("js") version "<pluginMarkerVersion>"
-}
-
-group = "com.example"
-version = "1.0"
-
-repositories {
-    mavenLocal()
-    jcenter()
-}
-
-kotlin {
-    target {
-        browser()
-    }
-
-    sourceSets {
-        getByName("main") {
-            dependencies {
-                implementation(kotlin("stdlib-js"))
-            }
-        }
-
-        getByName("test") {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
-        }
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/gradle.properties

@@ -1 +0,0 @@
-kotlin.tests.individualTaskReports=true

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/settings.gradle.kts

@@ -1,8 +0,0 @@
-pluginManagement {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-}
-
-rootProject.name = "kotlin-js-karma-download-chrome"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/main/kotlin/Service.kt

@@ -1,8 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package com.example
-
-fun value() = "value"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/test/kotlin/ServiceTest.kt

@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package com.example
-
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class ServiceTest {
-    @Test
-    fun serviceTest() {
-        assertEquals("value", value())
-    }
-
-    @Test
-    fun serviceFailTest() {
-        assertEquals("value12", value())
-    }
-}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/tests.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-  <testsuite name="com.example.ServiceTest" tests="2" skipped="0" failures="1" errors="0" timestamp="..." hostname="..." time="...">
-    <properties/>
-    <testcase name="serviceTest" classname="com.example.ServiceTest" time="..."/>
-    <testcase name="serviceFailTest" classname="com.example.ServiceTest" time="...">
-      <failure message="..." type="AssertionError">...</failure>
-    </testcase>
-    <system-out/>
-    <system-err/>
-  </testsuite>
-</results>
-

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt

@@ -87,20 +87,26 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
         configDirectory = dir
     }
 
-    fun useChrome() = useChromeWithPuppeteer(
-        id = "Chrome",
-        envVar = CHROME_BIN
-    )
+    fun useChrome() {
+        useBrowser(
+            id = "Chrome",
+            dependency = versions.karmaChromeLauncher
+        )
+    }
 
-    fun useChromeCanary() = useChromeWithPuppeteer(
-        id = "ChromeCanary",
-        envVar = CHROME_CANARY_BIN
-    )
+    fun useChromeCanary() {
+        useBrowser(
+            id = "ChromeCanary",
+            dependency = versions.karmaChromeLauncher
+        )
+    }
 
-    fun useChromeHeadless() = useChromeWithPuppeteer(
-        id = "ChromeHeadless",
-        envVar = CHROME_BIN
-    )
+    fun useChromeHeadless() {
+        useBrowser(
+            id = "ChromeHeadless",
+            dependency = versions.karmaChromeLauncher
+        )
+    }
 
     fun usePhantomJS() = useBrowser("PhantomJS", versions.karmaPhantomJsLauncher)
 
@@ -117,21 +123,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
         requiredDependencies.add(dependency)
     }
 
-    private fun useChromeWithPuppeteer(
-        id: String,
-        envVar: String
-    ) {
-        usePuppeteer(envVar)
-        useBrowser(id, versions.karmaChromeLauncher)
-    }
-
-    private fun usePuppeteer(envVar: String) {
-        requiredDependencies.add(versions.puppeteer)
-
-        //language=JavaScript 1.8
-        envJsCollector[envVar] = "require('puppeteer').executablePath()"
-    }
-
     private fun useMocha() {
         requiredDependencies.add(versions.karmaMocha)
         requiredDependencies.add(versions.mocha)