@zohodesk/testinglibrary 0.1.8-eslint-17 → 0.1.8-eslint-19

package/.vscode/settings.json

@@ -0,0 +1 @@
+{}

package/build/lint-ci/eslintLintStage.js

@@ -35,26 +35,27 @@ async function runEslintForDiff(cliParams, options = {}) {
   return await new Promise(resolve => {
     const command = ['eslint', lintFiles.join(' '), `--format=${format}`, '-o', `${reportPath}`];
     try {
-      const lint_process = (0, _child_process.spawnSync)('npx', command, {
+      const lint_process = (0, _child_process.spawn)('npx', command, {
         shell: true,
         cwd: process.cwd()
       });
-      if (lint_process.stderr) {
-        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, lint_process.stderr.toString());
-      }
-      if (lint_process.error) {
-        throw lintFiles.error;
-      }
+      lint_process.stdout.on('data', data => {
+        _logger.Logger.log(_logger.Logger.INFO_TYPE, data);
+      });
+      lint_process.stderr.on('error', err => {
+        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, err);
+      });
+      lint_process.on('close', onclose => {
+        if (diffPath && !(filteredDiffFiles.length === 0)) {
+          (0, _fileUtils.writeFileContents)(reportPath, filterReport_JSON(require(reportPath), diffJSON));
+        }
+        resolve({
+          status: 'success'
+        });
+      });
     } catch (error) {
       _logger.Logger.log(_logger.Logger.INFO_TYPE, error);
       _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'Execution Failed');
-    } finally {
-      if (diffPath && !(filteredDiffFiles.length === 0)) {
-        (0, _fileUtils.writeFileContents)(reportPath, filterReport_JSON(require(reportPath), diffJSON));
-      }
-      resolve({
-        status: 'success'
-      });
     }
   });
 }
@@ -100,7 +101,7 @@ function filterDiffJson(diffJson) {
   return diffFilesMap;
 }
 function getRootDir() {
-  return _path.default.resolve(process.cwd());
+  return process.cwd();
 }
 function getPathFromTestDir(diffPath) {
   if (!diffPath.includes('uat')) {
@@ -142,11 +143,13 @@ function getDiffJsonPath(diffJsonPath) {
   return _path.default.resolve(diffJsonPath);
 }
 function gitDiffFiles() {
-  const command = 'git diff HEAD HEAD~1 --name-only';
+  const command = 'git diff --cached -U0 HEAD --name-only';
   const child = (0, _child_process.spawnSync)(command, {
     shell: true
   });
-  return child.stdout.toString().split('\n').map(filePath => _path.default.resolve(getRootLintPath(), filePath));
+  const diffFiles = child.stdout.toString().split('\n').map(filePath => _path.default.resolve(getRootLintPath(), filePath));
+  diffFiles.pop(); // remove last empty string
+  return diffFiles;
 }
 function getRootLintPath() {
   const childProcess = (0, _child_process.spawnSync)('git', ['rev-parse', '--show-toplevel'], {

package/build/lint-ci/popUpCli.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const {
+  spawn
+} = require('child_process');

package/build/lint-ci/sonarReportSummary.js

@@ -18,8 +18,8 @@ function getSummaryOfLint(cliParams) {
     lintEnv
   } = (0, _cliArgsToObject.cliArgsToObject)(cliParams);
   return {
-    projectNameL: lintEnv === 'pre-commit' ? (0, _startSeverSonarQube.getProjectNameFrmGit)() : `${repo}_${branch},${username}`,
-    reportUrl: `https://serverlinter.zohodesk.csez.zohocorpin.com/project/issues?id=${repo}_${branch}_${username}&resolve=false`,
+    projectName: lintEnv === 'pre-commit' ? (0, _startSeverSonarQube.getProjectNameFrmGit)() : `${repo}_${branch},${username}`,
+    reportUrl: `https://serverlinter-np.zohodesk.csez.zohocorpin.com/project/issues?id=${repo}_${branch}_${username}&resolve=false`,
     jsonReportPath: (0, _eslintLintStage.getReportPath)().toString()
   };
 }

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

@@ -48,10 +48,9 @@ function runSonarAnalysis(cliParams) {
   if (lintEnv == 'pre-commit') {
     resultFilesPath = (0, _eslintLintStage.gitDiffFiles)().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_str}`, `-Dsonar.tests=${resultFilesPath}`, '-Dsonar.language=js', `-Dsonar.eslint.reportPaths=${(0, _eslintLintStage.getReportPath)()}`, '-Dsonar.javascript.lcov.reportPaths=coverage/lcov-report/lcov.info'];
+  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_str}`, `-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.INFO_TYPE, 'sending report to server  ...');
     _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, data);
   });
   child_process.stderr.on('data', errorOut => {
@@ -96,7 +95,7 @@ function getBranchName() {
   return branchName;
 }
 function getSpwanOutput(command, params = []) {
-  const demon_process = (0, _child_process.spawnSync)(command, {
+  const demon_process = (0, _child_process.spawnSync)(command, params, {
     shell: true
   });
   return demon_process.stdout.toString().split('\n').filter(Boolean);
@@ -113,6 +112,9 @@ function getCredentials(login, password) {
     Dpassword: 'developer'
   };
 }
+function getSonarArtifactsDir() {
+  return _path.default.resolve(process.cwd(), 'uat', 'lint-report', '.scannerwork');
+}
 
 // import scanner from 'sonarqube-scanner';
 // import { generateConfigFromFile } from '../core/playwright/readConfigFile';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.1.8-eslint-17",
+  "version": "0.1.8-eslint-19",
   "description": "",
   "main": "./build/index.js",
   "scripts": {