@zohodesk/testinglibrary 0.1.8-eslint-25 → 0.1.8-eslint-27

package/build/lint-ci/popUpCli.js

@@ -26,5 +26,5 @@ function showMsgPopUp(condition) {
   }
 }
 function getPopupJarPath() {
-  return _path.default.resolve('node_modules', '@zohodesk', 'testinglibrary', 'build', 'lint-ci', 'java-jar', 'IDEMessagePluginRecent.jar');
+  return _path.default.resolve(__dirname, 'java-jar', 'IDEMessagePluginRecent.jar');
 }

package/build/lint-ci/sonarReportSummary.js

@@ -24,7 +24,7 @@ function getSummaryOfLint(cliParams) {
   }
   return {
     projectName: $projectName,
-    reportUrl: `https://serverlinter-np.zohodesk.csez.zohocorpin.com/project/issues?id=${$projectName}&resolve=false`,
+    reportUrl: `https://serverlinter-np.zohodesk.csez.zohocorpin.com/project/issues?id=${$projectName}&resolved=false`,
     jsonReportPath: (0, _eslintLintStage.getReportPath)().toString()
   };
 }

package/build/lint-ci/startSever-sonarQube.js

@@ -9,7 +9,6 @@ exports.getProjectNameFrmGit = getProjectNameFrmGit;
 exports.getSpawnOutput = getSpawnOutput;
 exports.runSonarAnalysis = runSonarAnalysis;
 var _path = _interopRequireDefault(require("path"));
-var _fs = _interopRequireDefault(require("fs"));
 var _child_process = require("child_process");
 var _eslintLintStage = require("./eslintLintStage");
 var _cliArgsToObject = require("../utils/cliArgsToObject");
@@ -43,19 +42,17 @@ function runSonarAnalysis(cliParams) {
   } = getCredentials(login, password);
   var project_name = repo && branch && branch ? `${repo}_${branch}_${username}` : 'UAT_Testing';
   if (lintEnv === 'pre-commit') {
-    project_name = getProjectNameFrmGit();
+    project_name = `${getProjectNameFrmGit()}_pre-commit`;
   }
-  console.log(filterSpecAndFeatureFiles((0, _eslintLintStage.getDiffFiles)(require((0, _eslintLintStage.getDiffJsonPath)(diffPath)))));
   var resultFilesPath = diffPath ? (_filterSpecAndFeature = filterSpecAndFeatureFiles((0, _eslintLintStage.getDiffFiles)(require((0, _eslintLintStage.getDiffJsonPath)(diffPath))))) === null || _filterSpecAndFeature === void 0 ? void 0 : _filterSpecAndFeature.stepFilesPath.join(',') : [`${_path.default.resolve(process.cwd(), 'uat', 'modules')}`].join(',');
-  const source_directories = ((_filterSpecAndFeature2 = filterSpecAndFeatureFiles((0, _eslintLintStage.getDiffFiles)(require((0, _eslintLintStage.getDiffJsonPath)(diffPath))))) === null || _filterSpecAndFeature2 === void 0 ? void 0 : _filterSpecAndFeature2.featureFilesPath) || [' '];
+  var source_directories = diffPath ? (_filterSpecAndFeature2 = filterSpecAndFeatureFiles((0, _eslintLintStage.getDiffFiles)(require((0, _eslintLintStage.getDiffJsonPath)(diffPath))))) === null || _filterSpecAndFeature2 === void 0 ? void 0 : _filterSpecAndFeature2.featureFilesPath : [' '];
   if (lintEnv == 'pre-commit') {
     resultFilesPath = filterSpecAndFeatureFiles((0, _eslintLintStage.gitDiffFiles)()).stepFilesPath.join(',');
   }
   if (lintEnv == 'pre-commit') {
     source_directories = filterSpecAndFeatureFiles((0, _eslintLintStage.gitDiffFiles)()).featureFilesPath.join(',');
   }
-  const command = ['-jar', sonar_scanner_path, `-Dsonar.host.url=${sonarqube_host_url}`, `-Dsonar.projectKey=${project_name}`, `-Dsonar.login=${Dlogin}`, `-Dsonar.password=${Dpassword}`, `-Dsonar.sources=${source_directories.join(',')}`, `-Dsonar.tests=${resultFilesPath}`, '-Dsonar.language=js', `-Dsonar.working.directory=${getSonarArtifactsDir()}`, `-Dsonar.eslint.reportPaths=${(0, _eslintLintStage.getReportPath)()}`, '-Dsonar.javascript.lcov.reportPaths=coverage/lcov-report/lcov.info'];
-  console.log(command);
+  const command = ['-jar', sonar_scanner_path, `-Dsonar.host.url=${sonarqube_host_url}`, `-Dsonar.projectKey=${project_name}`, `-Dsonar.login=${Dlogin}`, `-Dsonar.password=${Dpassword}`, `-Dsonar.sources=${source_directories}`, `-Dsonar.tests=${resultFilesPath}`, '-Dsonar.language=js', `-Dsonar.working.directory=${getSonarArtifactsDir()}`, `-Dsonar.eslint.reportPaths=${(0, _eslintLintStage.getReportPath)()}`, '-Dsonar.javascript.lcov.reportPaths=coverage/lcov-report/lcov.info'];
   const child_process = (0, _child_process.spawn)('java', command);
   child_process.stdout.on('data', data => {
     _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, data);
@@ -110,10 +107,13 @@ function getRepoName() {
   return repoName.pop().split('/').pop().split('.')[0];
 }
 function getBranchName() {
-  const branchName = getSpawnOutput('git', ['branch'])[0]; // to get current branch
-  if (branchName.startsWith('*')) {
-    return branchName.replace('*', ' ').trim();
-  }
+  var branchName = getSpawnOutput('git', ['branch']); // to get current branch
+  branchName = branchName.filter($branch => {
+    if ($branch.startsWith('*') || $branch.includes('*')) {
+      return true;
+    }
+    return false;
+  }).shift();
   return branchName.trim();
 }
 function getSpawnOutput(command, params = []) {

package/build/utils/rootPath.js

@@ -47,7 +47,7 @@ function getExecutableBinaryPath(command) {
   }
 }
 function getSonarJarPath() {
-  const jarPath = _path.default.resolve('node_modules', '@zohodesk', 'testinglibrary', 'build', 'lint-ci', 'java-jar', 'sonar-scanner-cli-4.8.0.2856.jar');
+  const jarPath = _path.default.resolve(__dirname, '..', 'lint-ci', 'java-jar', 'sonar-scanner-cli-4.8.0.2856.jar');
   if ((0, _fileUtils.checkIfFileExists)(jarPath)) {
     return jarPath;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.1.8-eslint-25",
+  "version": "0.1.8-eslint-27",
   "description": "",
   "main": "./build/index.js",
   "scripts": {
@@ -50,7 +50,6 @@
     "@babel/polyfill": "7.12.1",
     "@babel/preset-env": "7.22.15",
     "@babel/runtime": "7.22.15",
-    "commander": "^11.0.0",
-    "sonarqube-scanner": "^3.3.0"
+    "commander": "^11.0.0"
   }
 }