From 35cb412dc31ca98b1a4aaa3698825d7e4d3cafb3 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 13 Nov 2019 12:11:19 +0300 Subject: [PATCH] [Gradle, JS] Fix source map support initializing for mocha --- .../targets/js/testing/mocha/KotlinMocha.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 4e7b7725446..df60c46bfb5 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,7 +31,8 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF override val requiredNpmDependencies: Collection get() = listOf( KotlinGradleNpmPackage("test-js-runner"), - versions.mocha + versions.mocha, + versions.sourceMapSupport ) // https://mochajs.org/#-timeout-ms-t-ms @@ -63,17 +64,17 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF val mocha = npmProject.require("mocha/bin/mocha") val adapter = npmProject.require("./$ADAPTER_NODEJS") - val args = mutableListOf(mocha).apply { + val args = mutableListOf( + "--require", + npmProject.require("source-map-support/register.js") + + ).apply { + add(mocha) addAll(cliArg("--inspect-brk", debug)) add(adapter) addAll(cliArgs.toList()) addAll(cliArg("--reporter", "kotlin-test-js-runner/mocha-kotlin-reporter.js")) addAll(cliArg("--timeout", timeout)) - addAll( - cliArg( - "-r", "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js" - ) - ) } return TCServiceMessagesTestExecutionSpec(