azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Fix tests, because kotlinNpmInstall can not be run

Browse Source
This commit is contained in:
Ilya Goncharov
2022-10-13 12:57:20 +02:00
committed by Space Team
parent 0547a89080
commit a1c61bb9a0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt
+1 -1
View File
@@ -122,7 +122,7 @@ abstract class AbstractJsConfigurationCacheIT(protected val irBackend: Boolean)
fun testTestDependencies(gradleVersion: GradleVersion) { fun testTestDependencies(gradleVersion: GradleVersion) {
project("kotlin-js-project-with-test-dependencies", gradleVersion) { project("kotlin-js-project-with-test-dependencies", gradleVersion) {
assertSimpleConfigurationCacheScenarioWorks( assertSimpleConfigurationCacheScenarioWorks(
"assemble", "assemble", "kotlinStoreYarnLock",
buildOptions = defaultBuildOptions, buildOptions = defaultBuildOptions,
executedTaskNames = listOf(":kotlinNpmInstall") executedTaskNames = listOf(":kotlinNpmInstall")
) )
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+3 -3
View File
@@ -1697,7 +1697,7 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() {
@GradleTest @GradleTest
fun testYarnLockStore(gradleVersion: GradleVersion) { fun testYarnLockStore(gradleVersion: GradleVersion) {
project("nodeJsDownload", gradleVersion) { project("nodeJsDownload", gradleVersion) {
build("assemble") { build("assemble", "kotlinStoreYarnLock") {
assertFileExists(projectPath.resolve("kotlin-js-store").resolve("yarn.lock")) assertFileExists(projectPath.resolve("kotlin-js-store").resolve("yarn.lock"))
assert( assert(
projectPath projectPath
@@ -1721,7 +1721,7 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() {
} }
""".trimIndent() """.trimIndent()
} }
build("assemble") { build("assemble", "kotlinNpmInstall") {
assert( assert(
projectPath projectPath
.resolve("build") .resolve("build")
@@ -1745,7 +1745,7 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() {
build("clean") build("clean")
build("assemble") { build("assemble", "kotlinNpmInstall") {
assertDirectoryExists( assertDirectoryExists(
projectPath projectPath
.resolve("build") .resolve("build")