From 9806ac992e492330f34b3d58ac27567b07819c35 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Wed, 1 Apr 2020 12:37:02 +0300
Subject: [PATCH] [Gradle, JS] KT-36784 Fix tests on composite

#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
---
 .../org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt  | 2 +-
 .../testProject/js-composite-build/app/build.gradle.kts     | 6 +++++-
 .../testProject/js-composite-build/lib/build.gradle.kts     | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

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 5b354ec4afb..c2d5875313d 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
@@ -581,7 +581,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) :
                 .let { it!!.version }
 
         with(appProject) {
-            build("build") {
+            build("build", "browserDevelopmentWebpack") {
                 assertSuccessful()
                 val appAsyncVersion = asyncVersion("build/js/node_modules/app", "async")
                 assertEquals("3.2.0", appAsyncVersion)
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/app/build.gradle.kts
index 7898a131d78..f15b4b32ed7 100755
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/app/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/app/build.gradle.kts
@@ -10,7 +10,11 @@ repositories {
 
 kotlin.js {
     binaries.executable()
-    nodejs()
+    browser()
+}
+
+tasks.named("browserTest").configure {
+    enabled = false
 }
 
 rootProject.tasks
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/lib/build.gradle.kts
index 2fa3109144b..b2866c64019 100755
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/lib/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/lib/build.gradle.kts
@@ -10,7 +10,11 @@ repositories {
     mavenLocal()
 }
 
-kotlin.target.nodejs()
+kotlin.target.browser()
+
+tasks.named("browserTest").configure {
+    enabled = false
+}
 
 rootProject.tasks
     .withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask::class.java)