@@ -22,24 +22,30 @@ fun getFrameworkLibraryPath(npmPackageName: String, model: JsTestsModel?): Strin
2222 return input.substringBefore(npmPackageName) + npmPackageName
2323}
2424
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(
2727 dir = model.project.basePath!! ,
2828 shouldWait = true ,
2929 timeout = 10 ,
30- cmd = arrayOf(model.pathToNPM, " list" , " -g " )
30+ cmd = arrayOf(model.pathToNPM, " list" , flag )
3131 )
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()) {
3541 Messages .showErrorDialog(
3642 model.project,
3743 " Node.js is not installed" ,
3844 " Generation Failed" ,
3945 )
4046 return false
4147 }
42- return checkForPackageText .contains(npmPackageName)
48+ return packageText .contains(npmPackageName)
4349}
4450
4551fun installRequirement (pathToNPM : String , requirement : String , installingDir : String? ): Pair <BufferedReader , BufferedReader > {
0 commit comments