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

[Gradle, JS] KT-36784 Fix tests on composite

Browse Source 
#KT-32466 fixed
#KT-36784 fixed
#KT-36864 fixed
This commit is contained in:
Ilya Goncharov
2020-04-01 12:37:02 +03:00
parent a27ae5dd7b
commit 9806ac992e
3 changed files with 11 additions and 3 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
+1 -1
View File
@@ -581,7 +581,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) :
.let { it!!.version } .let { it!!.version }
with(appProject) { with(appProject) {
build("build") { build("build", "browserDevelopmentWebpack") {
assertSuccessful() assertSuccessful()
val appAsyncVersion = asyncVersion("build/js/node_modules/app", "async") val appAsyncVersion = asyncVersion("build/js/node_modules/app", "async")
assertEquals("3.2.0", appAsyncVersion) assertEquals("3.2.0", appAsyncVersion)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/app/build.gradle.kts
+5 -1
View File
@@ -10,7 +10,11 @@ repositories {
kotlin.js { kotlin.js {
binaries.executable() binaries.executable()
nodejs() browser()
}
tasks.named("browserTest").configure {
enabled = false
} }
rootProject.tasks rootProject.tasks
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-composite-build/lib/build.gradle.kts
+5 -1
View File
@@ -10,7 +10,11 @@ repositories {
mavenLocal() mavenLocal()
} }
kotlin.target.nodejs() kotlin.target.browser()
tasks.named("browserTest").configure {
enabled = false
}
rootProject.tasks rootProject.tasks
.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask::class.java) .withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask::class.java)