From 6229b8682e589e5a48a33d97134194a9f74640c2 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 14 May 2019 11:17:27 +0300 Subject: [PATCH] Gradle, js: fix karma.conf.js by wrapping config in function #KT-31011 --- .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 f9895cfa6a3..31967154a4a 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 @@ -10,7 +10,6 @@ import org.gradle.api.Project import org.gradle.process.ProcessForkOptions import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec -import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs import org.jetbrains.kotlin.gradle.targets.js.npm.NpmPackageVersion @@ -88,14 +87,18 @@ class KotlinKarma(val project: Project) : KotlinJsTestFramework { val npmProject = task.project.npmProject config.files.addAll(task.nodeModulesToLoad.map { - npmProject.getModuleEntryPath(it) + npmProject.require(it) }) config.basePath = npmProject.nodeModulesDir.absolutePath val karmaConfJs = npmProject.nodeWorkDir.resolve("karma.conf.js") karmaConfJs.printWriter().use { + it.println("module.exports = function(config) {") + it.print(" config.set(") GsonBuilder().setPrettyPrinting().create().toJson(config, it) + it.println(");") + it.println("}") } val nodeModules = listOf("karma/bin/karma")