Jest/Mocha run config producers: fix searching for test runner package
#KT-26793 Fixed
This commit is contained in:
+2
-3
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.idea.nodejs.TestElementInfo
|
||||
import org.jetbrains.kotlin.idea.nodejs.TestElementPath
|
||||
import org.jetbrains.kotlin.idea.nodejs.getNodeJsEnvironmentVars
|
||||
import org.jetbrains.kotlin.idea.run.addBuildTask
|
||||
import org.jetbrains.kotlin.idea.util.sourceRoots
|
||||
|
||||
typealias JestTestElementInfo = TestElementInfo<JestRunSettings>
|
||||
|
||||
@@ -78,9 +79,7 @@ class KotlinJestRunConfigurationProducer :
|
||||
val element = context.psiLocation ?: return null
|
||||
val module = context.module?.asJsModule() ?: return null
|
||||
|
||||
val file = module.moduleFile
|
||||
|
||||
if (!isTestRunnerPackageAvailableFor(module.project, file)) return null
|
||||
if (module.sourceRoots.none { isTestRunnerPackageAvailableFor(module.project, it) }) return null
|
||||
|
||||
val testFilePath = module.jsTestOutputFilePath ?: return null
|
||||
val testElementPath = TestElementPath.forElement(element, module) ?: return null
|
||||
|
||||
+2
-1
@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.idea.nodejs.TestElementInfo
|
||||
import org.jetbrains.kotlin.idea.nodejs.TestElementPath
|
||||
import org.jetbrains.kotlin.idea.nodejs.getNodeJsEnvironmentVars
|
||||
import org.jetbrains.kotlin.idea.run.addBuildTask
|
||||
import org.jetbrains.kotlin.idea.util.sourceRoots
|
||||
|
||||
private typealias MochaTestElementInfo = TestElementInfo<MochaRunSettings>
|
||||
|
||||
@@ -115,7 +116,7 @@ class KotlinMochaRunConfigurationProducer : MochaRunConfigurationProducer(), Kot
|
||||
|
||||
if (context.getOriginalConfiguration(MochaConfigurationType.getInstance()) is MochaRunConfiguration) return configData
|
||||
|
||||
if (isTestRunnerPackageAvailableFor(project, file)) return configData
|
||||
if (module.sourceRoots.any { isTestRunnerPackageAvailableFor(project, it) }) return configData
|
||||
|
||||
val roots = collectMochaTestRoots(project)
|
||||
if (roots.isEmpty()) return null
|
||||
|
||||
Reference in New Issue
Block a user