From 91859d9ba97ae37dc80c10358f894597f167ad36 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Fri, 23 Dec 2022 17:40:50 +0300 Subject: [PATCH] Fixed mocha local installation --- .../intellij/plugin/language/js/Utils.kt | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/Utils.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/Utils.kt index 17cbc0852b..982c3f3dbc 100644 --- a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/Utils.kt +++ b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/Utils.kt @@ -22,16 +22,22 @@ fun getFrameworkLibraryPath(npmPackageName: String, model: JsTestsModel?): Strin return input.substringBefore(npmPackageName) + npmPackageName } -fun findFrameworkLibrary(npmPackageName: String, model: JsTestsModel): Boolean { - val (bufferedReader, _) = JsCmdExec.runCommand( +private fun npmListByFlag(model: JsTestsModel, flag: String): String { + val (bufferReader, _) = JsCmdExec.runCommand( dir = model.project.basePath!!, shouldWait = true, timeout = 10, - cmd = arrayOf(model.pathToNPM, "list", "-g") + cmd = arrayOf(model.pathToNPM, "list", flag) ) - val checkForPackageText = bufferedReader.readText() - bufferedReader.close() - if (checkForPackageText == "") { + val packages = bufferReader.readText() + bufferReader.close() + return packages +} + +fun findFrameworkLibrary(npmPackageName: String, model: JsTestsModel): Boolean { + val packageText = npmListByFlag(model, "-g") + npmListByFlag(model, "-l") + + if (packageText.isEmpty()) { Messages.showErrorDialog( model.project, "Node.js is not installed", @@ -39,7 +45,7 @@ fun findFrameworkLibrary(npmPackageName: String, model: JsTestsModel): Boolean { ) return false } - return checkForPackageText.contains(npmPackageName) + return packageText.contains(npmPackageName) } fun installRequirement(pathToNPM: String, requirement: String, installingDir: String?): Pair {