From a1c61bb9a072fbe6018438f86d0149bd1c3fcfe0 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 13 Oct 2022 12:57:20 +0200 Subject: [PATCH] [Gradle, JS] Fix tests, because kotlinNpmInstall can not be run --- .../org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt index 7e6c6716572..cfb4bd3e65c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt @@ -122,7 +122,7 @@ abstract class AbstractJsConfigurationCacheIT(protected val irBackend: Boolean) fun testTestDependencies(gradleVersion: GradleVersion) { project("kotlin-js-project-with-test-dependencies", gradleVersion) { assertSimpleConfigurationCacheScenarioWorks( - "assemble", + "assemble", "kotlinStoreYarnLock", buildOptions = defaultBuildOptions, executedTaskNames = listOf(":kotlinNpmInstall") ) 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 092c0b58261..f7947e57f42 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 @@ -1697,7 +1697,7 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() { @GradleTest fun testYarnLockStore(gradleVersion: GradleVersion) { project("nodeJsDownload", gradleVersion) { - build("assemble") { + build("assemble", "kotlinStoreYarnLock") { assertFileExists(projectPath.resolve("kotlin-js-store").resolve("yarn.lock")) assert( projectPath @@ -1721,7 +1721,7 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() { } """.trimIndent() } - build("assemble") { + build("assemble", "kotlinNpmInstall") { assert( projectPath .resolve("build") @@ -1745,7 +1745,7 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() { build("clean") - build("assemble") { + build("assemble", "kotlinNpmInstall") { assertDirectoryExists( projectPath .resolve("build")