@@ -22,24 +22,30 @@ fun getFrameworkLibraryPath(npmPackageName: String, model: JsTestsModel?): Strin
22
22
return input.substringBefore(npmPackageName) + npmPackageName
23
23
}
24
24
25
- fun findFrameworkLibrary ( npmPackageName : String , model : JsTestsModel ): Boolean {
26
- val (bufferedReader , _) = JsCmdExec .runCommand(
25
+ private fun npmListByFlag ( model : JsTestsModel , flag : String ): String {
26
+ val (bufferReader , _) = JsCmdExec .runCommand(
27
27
dir = model.project.basePath!! ,
28
28
shouldWait = true ,
29
29
timeout = 10 ,
30
- cmd = arrayOf(model.pathToNPM, " list" , " -g " )
30
+ cmd = arrayOf(model.pathToNPM, " list" , flag )
31
31
)
32
- val checkForPackageText = bufferedReader.readText()
33
- bufferedReader.close()
34
- if (checkForPackageText == " " ) {
32
+ val packages = bufferReader.readText()
33
+ bufferReader.close()
34
+ return packages
35
+ }
36
+
37
+ fun findFrameworkLibrary (npmPackageName : String , model : JsTestsModel ): Boolean {
38
+ val packageText = npmListByFlag(model, " -g" ) + npmListByFlag(model, " -l" )
39
+
40
+ if (packageText.isEmpty()) {
35
41
Messages .showErrorDialog(
36
42
model.project,
37
43
" Node.js is not installed" ,
38
44
" Generation Failed" ,
39
45
)
40
46
return false
41
47
}
42
- return checkForPackageText .contains(npmPackageName)
48
+ return packageText .contains(npmPackageName)
43
49
}
44
50
45
51
fun installRequirement (pathToNPM : String , requirement : String , installingDir : String? ): Pair <BufferedReader , BufferedReader > {
0 commit comments