diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 9b040b3de27..12275db4d33 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/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() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/build.gradle.kts deleted file mode 100644 index 496ef65a898..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/build.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - kotlin("js") version "" -} - -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")) - } - } - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/gradle.properties deleted file mode 100644 index a4a181c3de2..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -kotlin.tests.individualTaskReports=true \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/settings.gradle.kts deleted file mode 100644 index b84b9abdce1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/settings.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - } -} - -rootProject.name = "kotlin-js-karma-download-chrome" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/main/kotlin/Service.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/main/kotlin/Service.kt deleted file mode 100644 index 021f0b9c5a4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/main/kotlin/Service.kt +++ /dev/null @@ -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" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/test/kotlin/ServiceTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/test/kotlin/ServiceTest.kt deleted file mode 100644 index 99403a4c1ce..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/src/test/kotlin/ServiceTest.kt +++ /dev/null @@ -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()) - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/tests.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/tests.xml deleted file mode 100644 index bffa829bfa1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-karma-download-chrome/tests.xml +++ /dev/null @@ -1,13 +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 dfb000fffa7..1cb9efe097c 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 @@ -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)