From 40311dbe054f9718b643659853d2e71f6ded7d5a Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 10 Jul 2020 19:48:17 +0300 Subject: [PATCH] [Gradle, JS] Fix test on public package json with dependencies ^KT-40201 fixed --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 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 0f6c0a02878..0404d50eb34 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 @@ -576,22 +576,31 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : zipFile.getInputStream(packageJsonCandidates.single()).use { it.reader().use { val packageJson = Gson().fromJson(it, PackageJson::class.java) - assertTrue("There is no expected dev dependencies in package.json") { - packageJson.devDependencies.isEmpty() + val devDep = "42" + val devDepVersion = "0.0.1" + assertTrue("There is expected dev dependency \"$devDep\": \"$devDepVersion\" in package.json") { + val devDependencies = packageJson.devDependencies + devDependencies + .containsKey(devDep) && + devDependencies[devDep] == devDepVersion } - assertTrue("There is expected dependency \"@yworks/optimizer\": \"1.0.6\" in package.json") { + val dep = "@yworks/optimizer" + val depVersion = "1.0.6" + assertTrue("There is expected dependency \"$dep\": \"$depVersion\" in package.json") { val dependencies = packageJson.dependencies dependencies - .containsKey("@yworks/optimizer") && - dependencies["@yworks/optimizer"] == "1.0.6" + .containsKey(dep) && + dependencies[dep] == depVersion } - assertTrue("There is expected peer dependency \"date-arithmetic\": \"4.1.0\" in package.json") { + val peerDep = "date-arithmetic" + val peerDepVersion = "4.1.0" + assertTrue("There is expected peer dependency \"$peerDep\": \"$peerDepVersion\" in package.json") { val peerDependencies = packageJson.peerDependencies peerDependencies - .containsKey("date-arithmetic") && - peerDependencies["date-arithmetic"] == "4.1.0" + .containsKey(peerDep) && + peerDependencies[peerDep] == peerDepVersion } } }