Rename kotlin-test-nodejs-runner to kotlin-test-js-runner
This commit is contained in:
@@ -111,7 +111,7 @@ tasks.withType<Test> {
|
||||
":kotlin-scripting-common:install",
|
||||
":kotlin-scripting-jvm:install",
|
||||
":kotlin-scripting-compiler-embeddable:install",
|
||||
":kotlin-test-nodejs-runner:install"
|
||||
":kotlin-test-js-runner:install"
|
||||
)
|
||||
|
||||
executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
|
||||
|
||||
+4
-4
@@ -384,10 +384,10 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
|
||||
assertFileExists("build/js/node_modules/kotlin/kotlin.js.map")
|
||||
assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js")
|
||||
assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js.map")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js.map")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js.map")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-test-nodejs-runner.js")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-test-nodejs-runner.js.map")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-nodejs-source-map-support.js")
|
||||
assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-nodejs-source-map-support.js.map")
|
||||
assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js")
|
||||
assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js.map")
|
||||
assertFileExists("build/js/node_modules/kotlin-js-plugin-test/kotlin/kotlin-js-plugin-test.js")
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ class NpmVersions {
|
||||
|
||||
val puppeteer = NpmPackageVersion("puppeteer", "1.19.0")
|
||||
|
||||
val kotlinNodeJsTestRunner = KotlinGradleNpmPackage("test-nodejs-runner")
|
||||
val kotlinNodeJsTestRunner = KotlinGradleNpmPackage("test-js-runner")
|
||||
|
||||
val istanbulInstrumenterLoader = NpmPackageVersion("istanbul-instrumenter-loader", "3.0.1")
|
||||
}
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), Re
|
||||
if (sourceMapStackTraces) {
|
||||
args(
|
||||
"--require",
|
||||
compilation.npmProject.require("kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support")
|
||||
compilation.npmProject.require("kotlin-test-js-runner/kotlin-nodejs-source-map-support")
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -335,7 +335,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
|
||||
|
||||
val adapterJs = npmProject.dir.resolve("adapter.js")
|
||||
adapterJs.printWriter().use { writer ->
|
||||
val karmaRunner = npmProject.require("kotlin-test-nodejs-runner/kotlin-test-karma-runner.js")
|
||||
val karmaRunner = npmProject.require("kotlin-test-js-runner/kotlin-test-karma-runner.js")
|
||||
writer.println("require('$karmaRunner')")
|
||||
|
||||
files.forEach { file ->
|
||||
|
||||
+2
-2
@@ -28,7 +28,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF
|
||||
|
||||
override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
|
||||
get() = listOf(
|
||||
KotlinGradleNpmPackage("test-nodejs-runner"),
|
||||
KotlinGradleNpmPackage("test-js-runner"),
|
||||
versions.mocha,
|
||||
versions.mochaTeamCityReporter
|
||||
)
|
||||
@@ -58,7 +58,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF
|
||||
npmProject.require(it)
|
||||
} +
|
||||
listOf(
|
||||
"-r", "kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js",
|
||||
"-r", "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js",
|
||||
"--reporter", "mocha-teamcity-reporter"
|
||||
)
|
||||
|
||||
|
||||
+3
-3
@@ -29,7 +29,7 @@ class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : Ko
|
||||
get() = "KotlinNodeJsTestRunner(ignoredTestSuites=$ignoredTestSuites)"
|
||||
|
||||
override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
|
||||
get() = listOf(KotlinGradleNpmPackage("test-nodejs-runner"))
|
||||
get() = listOf(KotlinGradleNpmPackage("test-js-runner"))
|
||||
|
||||
override fun createTestExecutionSpec(
|
||||
task: KotlinJsTest,
|
||||
@@ -53,8 +53,8 @@ class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : Ko
|
||||
)
|
||||
|
||||
val testRuntimeNodeModules = listOf(
|
||||
"kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js",
|
||||
"kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js"
|
||||
"kotlin-test-js-runner/kotlin-test-nodejs-runner.js",
|
||||
"kotlin-test-js-runner/kotlin-nodejs-source-map-support.js"
|
||||
)
|
||||
|
||||
val args = nodeJsArgs +
|
||||
|
||||
Reference in New Issue
Block a user