@zohodesk/testinglibrary 0.1.8-eslint-16 → 0.1.8-eslint-18

package/build/lint-ci/eslintLintStage.js

@@ -41,7 +41,6 @@ async function runEslintForDiff(cliParams, options = {}) {
       });
       if (lint_process.stderr) {
         _logger.Logger.log(_logger.Logger.FAILURE_TYPE, lint_process.stderr.toString());
-        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, `\n Linting Failed ...`);
       }
       if (lint_process.error) {
         throw lintFiles.error;
@@ -101,7 +100,7 @@ function filterDiffJson(diffJson) {
   return diffFilesMap;
 }
 function getRootDir() {
-  return _path.default.resolve(process.cwd());
+  return process.cwd();
 }
 function getPathFromTestDir(diffPath) {
   if (!diffPath.includes('uat')) {
@@ -143,11 +142,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';
   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/startSever-sonarQube.js

@@ -23,7 +23,6 @@ var _rootPath = require("../utils/rootPath");
 
 function runSonarAnalysis(cliParams) {
   var _getFilePathFrmReport, _getFilePathFrmReport2;
-  _logger.Logger.log(_logger.Logger.INFO_TYPE, 'sending report to server  ...');
   const {
     diffPath,
     repo,
@@ -49,7 +48,7 @@ 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.SUCCESS_TYPE, data);
@@ -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-16",
+  "version": "0.1.8-eslint-18",
   "description": "",
   "main": "./build/index.js",
   "scripts": {