From 96ccf037945ccc936ea8676327d69d2650bec8c7 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 2 Oct 2020 18:10:04 +0300 Subject: [PATCH] [Gradle, JS] Test: Add yarn resolution by version shortcut ^KT-42420 fixed --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 25 ++++++++++--------- .../build.gradle.kts | 1 + 2 files changed, 14 insertions(+), 12 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 919306003c2..da584bc7161 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 @@ -763,17 +763,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) - fun assertYarnResolutions( - packageJson: PackageJson - ) { - val name = "lodash" - val version = packageJson.resolutions?.get(name) - val requiredVersion = ">=1.0.0 <1.2.1 || >1.4.0 <2.0.0" - assertTrue("Root package.json must have resolution $name with version $requiredVersion, but $version found") { - version == requiredVersion - } - } - build("packageJson", "rootPackageJson", "kotlinNpmInstall") { assertSuccessful() @@ -784,7 +773,19 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : Gson().fromJson(it.readText(), PackageJson::class.java) } - assertYarnResolutions(getPackageJson()) + val name = "lodash" + val version = getPackageJson().resolutions?.get(name) + val requiredVersion = ">=1.0.0 <1.2.1 || >1.4.0 <2.0.0" + assertTrue("Root package.json must have resolution $name with version $requiredVersion, but $version found") { + version == requiredVersion + } + + val react = "react" + val reactVersion = getPackageJson().resolutions?.get(react) + val requiredReactVersion = "16.0.0" + assertTrue("Root package.json must have resolution $react with version $requiredReactVersion, but $reactVersion found") { + reactVersion == requiredReactVersion + } } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/build.gradle.kts index 521cc9cb343..8356a932b79 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-yarn-resolutions/build.gradle.kts @@ -16,6 +16,7 @@ rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlu include("^1.0.0") exclude("~1.2.1", "1.3.0 - 1.4.0") } + resolution("react", "16.0.0") } }