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 8d43d394fae..d198e292a7b 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 @@ -59,7 +59,7 @@ class Kotlin2JsIrGradlePluginIT : AbstractKotlin2JsGradlePluginIT(true) { @GradleTest fun testCleanOutputWithEmptySources(gradleVersion: GradleVersion) { project("kotlin-js-nodejs-project", gradleVersion) { - build("build") { + build("assemble") { assertTasksExecuted(":compileProductionExecutableKotlinJs") assertFileInProjectExists("build/js/packages/kotlin-js-nodejs-project/kotlin/kotlin-js-nodejs-project.js") @@ -783,7 +783,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean) gradleProperties.appendText(jsCompilerType(KotlinJsCompilerType.IR)) } - build("build") { + build("assemble") { assertTasksExecuted(":app:browserProductionWebpack") assertDirectoryInProjectExists("build/js/packages/kotlin-js-browser-base-js-ir") @@ -1047,6 +1047,25 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean) } } + @DisplayName("configuration cache is working for kotlin/js node project") + @GradleTest + fun testConfigurationCacheNode(gradleVersion: GradleVersion) { + project("kotlin-js-nodejs-project", gradleVersion) { + assertSimpleConfigurationCacheScenarioWorks( + ":build", + buildOptions = defaultBuildOptions.withConfigurationCache, + executedTaskNames = listOf( + ":packageJson", + ":publicPackageJson", + ":rootPackageJson", + ":kotlinNpmInstall", + ":compileKotlinJs", + ":nodeTest", + ) + if (irBackend) listOf(":compileProductionExecutableKotlinJs") else emptyList() + ) + } + } + private fun TestProject.getSubprojectPackageJson(subProject: String, projectName: String? = null) = projectPath.resolve("build/js/packages/${projectName ?: projectName}-$subProject") .resolve(NpmProject.PACKAGE_JSON) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle index b5f207c5c0c..a5ca83678fd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle @@ -4,6 +4,7 @@ plugins { dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-js") + testImplementation("org.jetbrains.kotlin:kotlin-test-js") } repositories { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/src/test/kotlin/Tests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/src/test/kotlin/Tests.kt new file mode 100644 index 00000000000..b377049eda8 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/src/test/kotlin/Tests.kt @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +import kotlin.test.Test +import kotlin.test.assertEquals + +class Tests { + @Test + fun testHello() { + assertEquals(73, com.example.simpleBest()) + } +} \ No newline at end of file