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

[Gradle, JS] Fix according to recently Gradle test ifrastructure changes

Browse Source 
^KT-34014 fixed
^KT-49505 fixed
This commit is contained in:
Ilya Goncharov
2021-11-01 13:24:29 +03:00
committed by Space
parent ce57826ed3
commit 99f686af39
1 changed files with 11 additions and 6 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
+11 -6
View File
@@ -339,7 +339,11 @@ class Kotlin2JsGradlePluginIT : AbstractKotlin2JsGradlePluginIT(false) {
Files.copy(baseJar, modifiedBaseJar) Files.copy(baseJar, modifiedBaseJar)
val baseBuildscript = baseSubproject.buildGradleKts
val libBuildscript = libSubproject.buildGradleKts val libBuildscript = libSubproject.buildGradleKts
baseBuildscript.modify {
it.replace("js(\"both\")", "js(\"both\") { moduleName = \"base2\" }")
}
libBuildscript.modify { libBuildscript.modify {
it.replace("implementation(project(\":base\"))", "implementation(files(\"${normalizePath(originalBaseJar.toString())}\"))") it.replace("implementation(project(\":base\"))", "implementation(files(\"${normalizePath(originalBaseJar.toString())}\"))")
} }
@@ -1044,12 +1048,13 @@ class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() {
@DisplayName("Yarn.lock persistence") @DisplayName("Yarn.lock persistence")
@GradleTest @GradleTest
fun testYarnLockStore() = with(transformProjectWithPluginsDsl("cleanTask")) { fun testYarnLockStore(gradleVersion: GradleVersion) {
project("cleanTask", gradleVersion) {
build("assemble") { buildGradle.modify(::transformBuildScriptWithPluginsDsl)
assertSuccessful() build("assemble") {
assertFileExists("kotlin-yarn.lock") assertFileExists(projectPath.resolve("kotlin-yarn.lock"))
assert(fileInWorkingDir("kotlin-yarn.lock").readText() == fileInWorkingDir("build/js/yarn.lock").readText()) assert(projectPath.resolve("kotlin-yarn.lock").readText() == projectPath.resolve("build/js/yarn.lock").readText())
}
} }
} }
} }