From 79ef361e1affbe9f42625feddb8648373b335a22 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 18 Nov 2019 17:36:30 +0300 Subject: [PATCH] [Debugger, JS] Remove Mocha configuring in KotlinKarma --- .../kotlin/gradle/targets/js/testing/karma/KarmaConfig.kt | 7 +------ .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt | 1 - 2 files changed, 1 insertion(+), 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 38f62cf15b4..919d31f0a7d 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,12 +22,7 @@ data class KarmaConfig( ) data class KarmaClient( - val args: MutableList = mutableListOf(), - val mocha: KarmaMocha = KarmaMocha() -) - -data class KarmaMocha( - var timeout: String = "2s" + val args: MutableList = mutableListOf() ) 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 5b105517a53..db8d5b4a9df 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 @@ -256,7 +256,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF debug: Boolean ): TCServiceMessagesTestExecutionSpec { if (debug) { - config.client.mocha.timeout = "0" config.singleRun = false }