From e8e95e64761198aef81ed2b60ec1dbe8e705b009 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Wed, 23 Jun 2021 19:27:48 +0300 Subject: [PATCH] [Gradle, JS] Add test for KT-47154 regression #KT-47154 Fixed --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 13 +++++++++++++ .../build.gradle.kts | 18 ++++++++++++++++++ .../settings.gradle.kts | 8 ++++++++ .../src/main/kotlin/app.kt | 1 + .../src/test/kotlin/test.kt | 1 + 5 files changed, 41 insertions(+) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/settings.gradle.kts create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/main/kotlin/app.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/test/kotlin/test.kt 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 2e8bee54c56..5f1ee12db65 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 @@ -938,3 +938,16 @@ abstract class AbstractKotlin2JsGradlePluginIT(val irBackend: Boolean) : BaseGra Gson().fromJson(it.readText(), PackageJson::class.java) } } + +class GeneralKotlin2JsGradlePluginIT : BaseGradleIT() { + @Test + fun testJsBothModeWithTests() = with(Project("kotlin-js-both-mode-with-tests")) { + setupWorkingDir() + gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) + + build("build") { + assertSuccessful() + assertNoWarnings() + } + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts new file mode 100644 index 00000000000..2ece8609a85 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + kotlin("js").version("") +} + +group = "com.example" +version = "1.0" + +repositories { + mavenLocal() + mavenCentral() +} + +kotlin { + js(BOTH) { + nodejs { + } + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/settings.gradle.kts new file mode 100644 index 00000000000..395516d756e --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/settings.gradle.kts @@ -0,0 +1,8 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + } +} + +rootProject.name = "kotlin-js-both-mode-with-tests" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/main/kotlin/app.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/main/kotlin/app.kt new file mode 100644 index 00000000000..de931e13178 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/main/kotlin/app.kt @@ -0,0 +1 @@ +fun foo() = 5 \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/test/kotlin/test.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/test/kotlin/test.kt new file mode 100644 index 00000000000..a2628a18fce --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/src/test/kotlin/test.kt @@ -0,0 +1 @@ +fun bar() = foo() \ No newline at end of file