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

Migrate filtering adapter on mocha's initial adapter

Browse Source
This commit is contained in:
Ilya Goncharov
2019-10-09 19:58:10 +03:00
parent 9ab2b928bc
commit 07e4b1f3de
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
+12 -4
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinTestRunnerCliArgs
class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestFramework {
private val project: Project = compilation.target.project
@@ -46,20 +47,27 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF
ignoreOutOfRootNodes = true
)
val npmProject = compilation.npmProject
val cliArgs = KotlinTestRunnerCliArgs(
task.nodeModulesToLoad.map { npmProject.require(it) },
task.includePatterns,
task.excludePatterns
)
val nodeModules = listOf(
"mocha/bin/mocha",
task.nodeModulesToLoad.single()
)
val npmProject = compilation.npmProject
val args = nodeJsArgs +
nodeModules.map {
npmProject.require(it)
} +
} + cliArgs.toList() +
listOf("--reporter", "mocha-teamcity-reporter") +
listOf(
"-r", "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js",
"--reporter", "mocha-teamcity-reporter"
"-r", "kotlin-test-js-runner/kotlin-test-nodejs-runner.js"
)
return TCServiceMessagesTestExecutionSpec(