azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gradle, js: fix karma.conf.js by wrapping config in function

Browse Source 
#KT-31011
This commit is contained in:
Sergey Rostov
2019-05-14 11:17:27 +03:00
parent 8e2075ebcc
commit 6229b8682e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+5 -2
View File
@@ -10,7 +10,6 @@ import org.gradle.api.Project
import org.gradle.process.ProcessForkOptions import org.gradle.process.ProcessForkOptions
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec 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.internal.parseNodeJsStackTraceAsJvm
import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmPackageVersion import org.jetbrains.kotlin.gradle.targets.js.npm.NpmPackageVersion
@@ -88,14 +87,18 @@ class KotlinKarma(val project: Project) : KotlinJsTestFramework {
val npmProject = task.project.npmProject val npmProject = task.project.npmProject
config.files.addAll(task.nodeModulesToLoad.map { config.files.addAll(task.nodeModulesToLoad.map {
npmProject.getModuleEntryPath(it) npmProject.require(it)
}) })
config.basePath = npmProject.nodeModulesDir.absolutePath config.basePath = npmProject.nodeModulesDir.absolutePath
val karmaConfJs = npmProject.nodeWorkDir.resolve("karma.conf.js") val karmaConfJs = npmProject.nodeWorkDir.resolve("karma.conf.js")
karmaConfJs.printWriter().use { karmaConfJs.printWriter().use {
it.println("module.exports = function(config) {")
it.print(" config.set(")
GsonBuilder().setPrettyPrinting().create().toJson(config, it) GsonBuilder().setPrettyPrinting().create().toJson(config, it)
it.println(");")
it.println("}")
} }
val nodeModules = listOf("karma/bin/karma") val nodeModules = listOf("karma/bin/karma")