From fc4bcfb53678b9ac29b49b94b119638649951a3b Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 9 Sep 2019 17:50:05 +0300
Subject: [PATCH] Add test on yarn downloading non-default version - Previously
 we skipped yarn setup, if yarn folder exists, not paying attention on what
 concrete yarn version installed

---
 .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt          | 11 +++++++++++
 .../resources/testProject/yarn-setup/build.gradle.kts | 11 +++++++++++
 2 files changed, 22 insertions(+)

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 59053c33b20..eb2d2461f46 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
@@ -432,5 +432,16 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
                 ":yarnFolderCheck"
             )
         }
+
+        gradleBuildScript().appendText("\nyarn.version = \"1.9.3\"")
+
+        build("yarnConcreteVersionFolderChecker") {
+            assertSuccessful()
+
+            assertTasksExecuted(
+                ":kotlinYarnSetup",
+                ":yarnConcreteVersionFolderChecker"
+            )
+        }
     }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/yarn-setup/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/yarn-setup/build.gradle.kts
index d32aabe4a90..4db8370aa15 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/yarn-setup/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/yarn-setup/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnSetupTask
 import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
 
 plugins {
@@ -30,6 +31,16 @@ tasks {
             }
         }
     }
+
+    val yarnConcreteVersionFolderChecker by registering {
+        dependsOn(getByName("kotlinYarnSetup"))
+
+        doLast {
+            if (!yarn.installationDir.resolve("yarn-v1.9.3").exists()) {
+                throw GradleException()
+            }
+        }
+    }
 }
 
 kotlin.sourceSets {