From 821a4ea472a487893ae1a29d40a8b4f0fe218a0c Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 14 Nov 2019 15:32:36 +0300 Subject: [PATCH] [Debugger, JS] Use default js debug configuration with Karma --- .../targets/js/testing/karma/KarmaConfig.kt | 7 ++++++- .../targets/js/testing/karma/KotlinKarma.kt | 16 ++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt index 919d31f0a7d..38f62cf15b4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt @@ -22,7 +22,12 @@ data class KarmaConfig( ) data class KarmaClient( - val args: MutableList = mutableListOf() + val args: MutableList = mutableListOf(), + val mocha: KarmaMocha = KarmaMocha() +) + +data class KarmaMocha( + var timeout: String = "2s" ) class CustomLauncher(var base: String) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index ef4d7c0a042..9d01bb1d03e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -56,9 +56,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF useMocha() useWebpack() useSourceMapSupport() - - config.singleRun = true - config.autoWatch = false } private fun useKotlinReporter() { @@ -309,9 +306,16 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF val nodeModules = listOf("karma/bin/karma") - val args = nodeJsArgs + - nodeModules.map { npmProject.require(it) } + - listOf("start", karmaConfJs.absolutePath) + val args = if (debug) { + config.client.mocha.timeout = "0" + + //TODO need generate it + listOf("./debugRunner.js") + } else { + nodeJsArgs + + nodeModules.map { npmProject.require(it) } + + listOf("start", karmaConfJs.absolutePath) + } return object : JSServiceMessagesTestExecutionSpec( forkOptions,