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

[Gradle, Wasm] Fix mismatch report message for upgradeLockFile

Browse Source 
^KT-65870 fixed
This commit is contained in:
Ilya Goncharov
2024-02-19 17:34:40 +04:00
committed by Space Team
parent 8365915b3f
commit eabd2f0fc7
5 changed files with 30 additions and 16 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/Kotlin2JsGradlePluginIT.kt
-5
View File
@@ -12,15 +12,10 @@ import org.gradle.testkit.runner.BuildResult
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.targets.js.dsl.Distribution
import org.jetbrains.kotlin.gradle.targets.js.ir.KLIB_TYPE
import org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask
import org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask.Companion.PACKAGE_LOCK_MISMATCH_MESSAGE
import org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask.Companion.RESTORE_PACKAGE_LOCK_NAME
import org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask.Companion.STORE_PACKAGE_LOCK_NAME
import org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask.Companion.UPGRADE_PACKAGE_LOCK
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson
import org.jetbrains.kotlin.gradle.targets.js.npm.fromSrcPackageJson
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
import org.jetbrains.kotlin.gradle.testbase.*
import org.jetbrains.kotlin.gradle.testbase.TestVersions.Gradle.G_7_6
import org.jetbrains.kotlin.gradle.util.replaceText
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PackageManagerGradlePluginIT.kt
+9 -3
View File
@@ -43,6 +43,8 @@ class NpmGradlePluginIT : PackageManagerGradlePluginIT() {
override val lockFileName: String = LockCopyTask.PACKAGE_LOCK
override val setProperty: (String) -> String = { ".set($it)" }
override val mismatchReportMessage: String = PACKAGE_LOCK_MISMATCH_MESSAGE
}
class YarnGradlePluginIT : PackageManagerGradlePluginIT() {
@@ -69,6 +71,8 @@ class YarnGradlePluginIT : PackageManagerGradlePluginIT() {
override val lockFileName: String = LockCopyTask.YARN_LOCK
override val setProperty: (String) -> String = { " = $it" }
override val mismatchReportMessage: String = YarnPlugin.YARN_LOCK_MISMATCH_MESSAGE
}
@JsGradlePluginTests
@@ -98,6 +102,8 @@ abstract class PackageManagerGradlePluginIT : KGPBaseTest() {
abstract val setProperty: (String) -> String
abstract val mismatchReportMessage: String
override val defaultBuildOptions: BuildOptions
get() = super.defaultBuildOptions.copy(
jsOptions = super.defaultBuildOptions.jsOptions?.copy(
@@ -247,7 +253,7 @@ abstract class PackageManagerGradlePluginIT : KGPBaseTest() {
assertTasksExecuted(":$restoreTaskName")
assertTasksExecuted(":$storeTaskName")
assertOutputContains(PACKAGE_LOCK_MISMATCH_MESSAGE)
assertOutputContains(mismatchReportMessage)
}
build(upgradeTaskName) {
@@ -276,7 +282,7 @@ abstract class PackageManagerGradlePluginIT : KGPBaseTest() {
assertTasksExecuted(":$restoreTaskName")
assertTasksExecuted(":$storeTaskName")
assertOutputDoesNotContain(PACKAGE_LOCK_MISMATCH_MESSAGE)
assertOutputDoesNotContain(mismatchReportMessage)
}
build(upgradeTaskName) {
@@ -312,7 +318,7 @@ abstract class PackageManagerGradlePluginIT : KGPBaseTest() {
assertTasksSkipped(":$restoreTaskName")
assertTasksExecuted(":$storeTaskName")
assertOutputDoesNotContain(PACKAGE_LOCK_MISMATCH_MESSAGE)
assertOutputDoesNotContain(mismatchReportMessage)
}
buildGradleKts.modify {