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

Gradle, nodeJs: fix tests

Browse Source
This commit is contained in:
Sergey Rostov
2019-05-14 15:09:08 +03:00
parent a13a86a543
commit 9610c60b17
2 changed files with 7 additions and 3 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/KotlinJsTest.kt
+1 -1
View File
@@ -33,7 +33,7 @@ open class KotlinJsTest : KotlinTest(), RequiresNpmDependencies {
override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency> override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
get() = testFramework!!.requiredNpmDependencies get() = testFramework!!.requiredNpmDependencies
fun useNodeJs(body: KotlinNodeJsTestRunner.() -> Unit) = use(KotlinNodeJsTestRunner(), body) fun useNodeJs(body: KotlinNodeJsTestRunner.() -> Unit) = use(KotlinNodeJsTestRunner(project), body)
fun useMocha(body: KotlinMocha.() -> Unit) = use(KotlinMocha(project), body) fun useMocha(body: KotlinMocha.() -> Unit) = use(KotlinMocha(project), body)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt
+6 -2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.targets.js.testing.nodejs package org.jetbrains.kotlin.gradle.targets.js.testing.nodejs
import org.gradle.api.Project
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
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
@@ -13,11 +14,12 @@ import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJv
import org.jetbrains.kotlin.gradle.targets.js.npm.KotlinGradleNpmPackage import org.jetbrains.kotlin.gradle.targets.js.npm.KotlinGradleNpmPackage
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
import org.jetbrains.kotlin.gradle.targets.js.npm.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.npm.RequiredKotlinJsDependency
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
import org.jetbrains.kotlin.gradle.testing.IgnoredTestSuites import org.jetbrains.kotlin.gradle.testing.IgnoredTestSuites
class KotlinNodeJsTestRunner : KotlinJsTestFramework { class KotlinNodeJsTestRunner(val project: Project) : KotlinJsTestFramework {
@Input @Input
var ignoredTestSuites: IgnoredTestSuites = IgnoredTestSuites.showWithContents var ignoredTestSuites: IgnoredTestSuites = IgnoredTestSuites.showWithContents
@@ -29,8 +31,10 @@ class KotlinNodeJsTestRunner : KotlinJsTestFramework {
forkOptions: ProcessForkOptions, forkOptions: ProcessForkOptions,
nodeJsArgs: MutableList<String> nodeJsArgs: MutableList<String>
): TCServiceMessagesTestExecutionSpec { ): TCServiceMessagesTestExecutionSpec {
val npmProject = project.npmProject
val cliArgs = KotlinNodeJsTestRunnerCliArgs( val cliArgs = KotlinNodeJsTestRunnerCliArgs(
task.nodeModulesToLoad.toList(), task.nodeModulesToLoad.map { npmProject.require(it) },
task.includePatterns, task.includePatterns,
task.excludePatterns, task.excludePatterns,
ignoredTestSuites.cli ignoredTestSuites.cli