From 7e47be9765647dbea4a8bfeecb5af6a30f911dbc Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Tue, 1 Oct 2019 17:40:37 +0300
Subject: [PATCH] Add kotlin js test runner as required dependency for Karma

#KT-34123 fixed
---
 .../org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt    | 2 +-
 .../jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt  | 2 +-
 .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt    | 5 ++++-
 3 files changed, 6 insertions(+), 3 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 20d6fab5e43..2b112ea9761 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
@@ -46,7 +46,7 @@ class NpmVersions {
 
     val puppeteer = NpmPackageVersion("puppeteer", "1.19.0")
 
-    val kotlinNodeJsTestRunner = KotlinGradleNpmPackage("test-js-runner")
+    val kotlinJsTestRunner = KotlinGradleNpmPackage("test-js-runner")
 
     val istanbulInstrumenterLoader = NpmPackageVersion("istanbul-instrumenter-loader", "3.0.1")
 }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
index 4e3a71c77a5..59810e6a5b8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
@@ -33,7 +33,7 @@ open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), Re
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
         get() = mutableListOf<RequiredKotlinJsDependency>().also {
             if (sourceMapStackTraces) {
-                it.add(nodeJs.versions.kotlinNodeJsTestRunner)
+                it.add(nodeJs.versions.kotlinJsTestRunner)
             }
         }
 
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 2919e20099b..701bf9678e5 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
@@ -44,7 +44,10 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
     private var configDirectory: File? = project.projectDir.resolve("karma.config.d").takeIf { it.isDirectory }
 
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
-        get() = requiredDependencies.toList()
+        get() = mutableListOf<RequiredKotlinJsDependency>().also {
+            it.add(versions.kotlinJsTestRunner)
+            it.addAll(requiredDependencies)
+        }
 
     override val settingsState: String
         get() = "KotlinKarma($config)"