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

Gradle, Kotlin/JS: enable source maps by default, get it working on tests.

Browse Source 
Publish kotlin-test-nodejs-runner separately from kotlin-gradle-plugin.
This commit is contained in:
Sergey Rostov
2019-03-25 15:39:03 +03:00
parent a4cbec64b7
commit 0e0c78317d
17 changed files with 586 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+2 -1
View File
@@ -68,7 +68,8 @@ projectTest {
":examples:annotation-processor-example:install",
":kotlin-scripting-common:install",
":kotlin-scripting-jvm:install",
":kotlin-scripting-compiler-embeddable:install"
":kotlin-scripting-compiler-embeddable:install",
":kotlin-test-nodejs-runner:install"
)
exclude(jpsIncrementalTestsClass)
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+18
View File
@@ -380,6 +380,24 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
assertFileExists(moduleDir + "kotlin-js-plugin-1.0-sources.jar")
assertFileExists("build/test_node_modules/kotlin.js")
assertFileExists("build/test_node_modules/kotlin.js.map")
assertFileExists("build/test_node_modules/kotlin-test.js")
assertFileExists("build/test_node_modules/kotlin-test.js.map")
assertFileExists("build/test_node_modules/kotlin-test-nodejs-runner.js")
assertFileExists("build/test_node_modules/kotlin-test-nodejs-runner.js.map")
assertFileExists("build/test_node_modules/kotlin-nodejs-source-map-support.js")
assertFileExists("build/test_node_modules/kotlin-nodejs-source-map-support.js.map")
assertFileExists("build/test_node_modules/kotlin-js-plugin.js")
assertFileExists("build/test_node_modules/kotlin-js-plugin.js.map")
assertFileExists("build/test_node_modules/kotlin-js-plugin_test.js")
assertFileExists("build/test_node_modules/kotlin-js-plugin_test.js.map")
assertFileContains(
"build/test_node_modules/kotlin-js-plugin_test.js.map",
"\"sources\":[\"../../src/test/kotlin/MainTest.kt\"]"
)
assertTestResults("testProject/kotlin-js-plugin-project/tests.xml", "test")
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt
+18 -10
View File
@@ -311,8 +311,6 @@ class MultiplatformGradleIT : BaseGradleIT() {
assertSuccessful()
assertTasksRegisteredAndNotRealized(
":kotlinNodeJsTestRuntimeExtract",
":clientTestNodeModules",
":clientTest",
@@ -325,8 +323,6 @@ class MultiplatformGradleIT : BaseGradleIT() {
assertSuccessful()
assertTasksExecuted(
":kotlinNodeJsTestRuntimeExtract",
":clientTestNodeModules",
":clientTest",
@@ -334,6 +330,24 @@ class MultiplatformGradleIT : BaseGradleIT() {
":serverTest"
)
assertFileExists("build/client_test_node_modules/kotlin.js")
assertFileExists("build/client_test_node_modules/kotlin.js.map")
assertFileExists("build/client_test_node_modules/kotlin-test.js")
assertFileExists("build/client_test_node_modules/kotlin-test.js.map")
assertFileExists("build/client_test_node_modules/kotlin-test-nodejs-runner.js")
assertFileExists("build/client_test_node_modules/kotlin-test-nodejs-runner.js.map")
assertFileExists("build/client_test_node_modules/kotlin-nodejs-source-map-support.js")
assertFileExists("build/client_test_node_modules/kotlin-nodejs-source-map-support.js.map")
assertFileExists("build/client_test_node_modules/new-mpp-js-tests.js")
assertFileExists("build/client_test_node_modules/new-mpp-js-tests.js.map")
assertFileExists("build/client_test_node_modules/new-mpp-js-tests_test.js")
assertFileExists("build/client_test_node_modules/new-mpp-js-tests_test.js.map")
assertFileContains(
"build/client_test_node_modules/new-mpp-js-tests_test.js.map",
"\"sources\":[\"../../src/commonTest/kotlin/CommonTest.kt\"]"
)
assertTestResults("testProject/new-mpp-js-tests/TEST-CommonTest.xml", "clientTest")
assertTestResults("testProject/new-mpp-js-tests/TEST-CommonTest.xml", "serverTest")
}
@@ -343,8 +357,6 @@ class MultiplatformGradleIT : BaseGradleIT() {
assertSuccessful()
assertTasksUpToDate(
":kotlinNodeJsTestRuntimeExtract",
":clientTestNodeModules",
":clientTest",
@@ -359,10 +371,6 @@ class MultiplatformGradleIT : BaseGradleIT() {
build("check") {
assertSuccessful()
assertTasksUpToDate(
":kotlinNodeJsTestRuntimeExtract"
)
assertTasksExecuted(
":clientTestNodeModules",
":clientTest",