From 7f49caf503e46e0799d62999ef25151118ff6f99 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 23 Oct 2019 13:33:54 +0300 Subject: [PATCH] [Gradle, JS] Depends node test on our own mocha reporter --- .../org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt | 1 - .../kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt index f23355430f2..0d0aa229126 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt @@ -27,7 +27,6 @@ class NpmVersions { val sourceMapSupport = NpmPackageVersion("source-map-support", "0.5.13") val mocha = NpmPackageVersion("mocha", "6.2.2") - val mochaTeamCityReporter = NpmPackageVersion("mocha-teamcity-reporter", "3.0.0") val karma = NpmPackageVersion("karma", "4.4.1") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt index 22f0a126ba3..1147628cc43 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt @@ -31,8 +31,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF override val requiredNpmDependencies: Collection get() = listOf( KotlinGradleNpmPackage("test-js-runner"), - versions.mocha, - versions.mochaTeamCityReporter + versions.mocha ) // https://mochajs.org/#-timeout-ms-t-ms @@ -69,7 +68,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF nodeModules.map { npmProject.require(it) } + cliArgs.toList() + - cliArg("--reporter", "mocha-teamcity-reporter") + + cliArg("--reporter", "kotlin-test-js-runner/mocha-kotlin-reporter.js") + cliArg("--timeout", timeout) + cliArg( "-r", "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js"