@zohodesk/react-cli 0.0.1-beta.16 → 0.0.1-beta.162

package/lib/jest/coverageCollector.js

@@ -1,71 +1,104 @@
-'use strict';
+"use strict";
 
-var _path = require('path');
+var _path = _interopRequireDefault(require("path"));
 
-var _path2 = _interopRequireDefault(_path);
-
-var _utils = require('../utils');
+var _utils = require("../utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function listMaker(listOfObject) {
-  var fileNameList = [];
-  var curListName = process.cwd().split(_path2.default.sep);
+function jsFileFilter(listOfObject) {
+  let fileNameList = [];
+  let curListName = process.cwd().split(_path.default.sep);
+  let currentDirName = curListName[curListName.length - 1];
+  listOfObject.forEach(fileObj => {
+    let fileName = fileObj.FILEPATH;
+
+    if (fileName.includes(currentDirName)) {
+      fileName = fileName.split(currentDirName + '/')[1]; //eslint-disable-line
 
-  listOfObject.forEach(function (fileObj) {
-    var fileName = fileObj.FILEPATH;
-    fileName = fileName.replace(curListName[curListName.length - 2] + _path2.default.sep + curListName[curListName.length - 1] + _path2.default.sep, '');
-    fileName = fileName.replace('jsapps/components/', '');
-    if (fileName.includes('.js') && !fileName.includes('.json') && !fileName.includes('.docs.js')) {
-      fileNameList.push(fileName);
+      if (fileName.includes('.js') && !fileName.includes('.json') && !fileName.includes('.docs.js') && !fileName.includes('.spec.js')) {
+        fileNameList.push(fileName);
+      }
     }
   });
   return fileNameList;
 }
 
 function coverage(devBranch, compareWith, serviceName, domain) {
-  return new Promise(function (resolve) {
+  return new Promise(resolve => {
     (0, _utils.request)({
-      url: domain + '/impact/ImpactModuleAction.do?action=getCommitDiffFileDetail&serviceName=' + serviceName + '&masterBranchCommitHash=' + compareWith + '&buildCommitHash=' + devBranch
-    }).then(function (_ref) {
-      var body = _ref.body;
+      url: `${domain}/impact/ImpactModuleAction.do?action=getCommitDiffFileDetail&serviceName=${serviceName}&masterBranchCommitHash=${compareWith}&buildCommitHash=${devBranch}`
+    }).then(({
+      body
+    }) => {
+      let res = JSON.parse(body);
 
-      var res = JSON.parse(body);
       if (Object.keys(res).length > 0) {
         if (Object.prototype.hasOwnProperty.call(res, 'STATUS')) {
           if (res.STATUS) {
-            var listOfFiles = [];
+            let listOfFiles = [];
+
             if (Object.keys(res.DIFF_FILES).length > 0) {
               if (Object.prototype.hasOwnProperty.call(res.DIFF_FILES, 'ADDED')) {
                 if (res.DIFF_FILES.ADDED.length > 0) {
-                  listOfFiles = listOfFiles.concat(listMaker(res.DIFF_FILES.ADDED));
+                  listOfFiles = listOfFiles.concat(jsFileFilter(res.DIFF_FILES.ADDED));
                 }
               }
+
               if (Object.prototype.hasOwnProperty.call(res.DIFF_FILES, 'UPDATED')) {
                 if (res.DIFF_FILES.UPDATED.length > 0) {
-                  listOfFiles = listOfFiles.concat(listMaker(res.DIFF_FILES.UPDATED));
+                  listOfFiles = listOfFiles.concat(jsFileFilter(res.DIFF_FILES.UPDATED));
                 }
               }
-              resolve({ STATUS: true, LIST: listOfFiles, REASON: 'success' });
+
+              if (listOfFiles.length > 0) {
+                resolve({
+                  STATUS: true,
+                  LIST: listOfFiles,
+                  REASON: 'success'
+                });
+              } else {
+                resolve({
+                  STATUS: false,
+                  LIST: listOfFiles,
+                  REASON: 'No modified js files'
+                });
+              }
             } else {
               resolve({
                 STATUS: false,
                 LIST: [],
-                REASON: 'No modified js files'
+                REASON: 'No changes with last changeset'
               });
             }
           } else {
-            resolve({ STATUS: false, LIST: [], REASON: 'Internal Error' });
+            resolve({
+              STATUS: false,
+              LIST: [],
+              REASON: 'Internal Error'
+            });
           }
         } else {
-          resolve({ STATUS: false, LIST: [], REASON: 'Internal Error' });
+          resolve({
+            STATUS: false,
+            LIST: [],
+            REASON: 'Internal Error'
+          });
         }
       } else {
-        resolve({ STATUS: false, LIST: [], REASON: 'Internal Error' });
+        resolve({
+          STATUS: false,
+          LIST: [],
+          REASON: 'Internal Error'
+        });
       }
-    }).catch(function (err) {
+    }).catch(err => {
       (0, _utils.log)(err);
-      resolve({ STATUS: false, LIST: [], REASON: 'Service Down' });
+      resolve({
+        STATUS: false,
+        LIST: [],
+        REASON: 'Service Down'
+      });
     });
   });
 }

package/lib/jest/jsonMaker.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _jsonHelper = require("../utils/jsonHelper");
+
+var _default = (resultObj, coverage, status = true, type = 'unitcase', filecoverage = 0) => {
+  let pathArray = [];
+  let resultJson = {};
+  resultJson.isExecuted = status;
+  resultJson.numberOfSuccess = resultObj.numPassedTests;
+  resultJson.numberOfFails = resultObj.numFailedTests;
+  resultJson.numberOfCases = resultObj.numTotalTests;
+  resultJson.numberOfSuites = resultObj.numTotalTestSuites;
+  resultJson.endTime = resultObj.endTime;
+  resultJson.startTime = resultObj.startTime;
+  resultJson.coverageDetail = {
+    codeCoveragePercentage: coverage,
+    fileCoveragePercentage: filecoverage
+  };
+  let fileDetailList = [];
+  resultObj.testResults.map(testFile => {
+    let fileObj = {};
+    fileObj.fileName = testFile.testFilePath;
+    fileObj.CaseList = {};
+    fileObj.CaseList.passedCaseList = [];
+    fileObj.CaseList.failedCaseList = [];
+    testFile.testResults.map(testCase => {
+      if (testCase.status === 'failed') {
+        fileObj.CaseList.failedCaseList.push(testCase.title);
+      } else if (testCase.status === 'passed') {
+        fileObj.CaseList.passedCaseList.push(testCase.title);
+      }
+
+      return testCase;
+    });
+    fileDetailList.push(fileObj);
+    return testFile;
+  });
+
+  if (type !== 'unitcase') {
+    Array.prototype.push.apply(pathArray, ['tests', 'modifiedFileUnitCase']);
+  } else {
+    Array.prototype.push.apply(pathArray, ['tests', 'unitCase']);
+  }
+
+  resultJson.fileDetails = fileDetailList;
+  (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, pathArray, resultJson);
+};
+
+exports.default = _default;

package/lib/jest/preProcessors/cssPreprocessor.js

@@ -1,31 +1,29 @@
-'use strict';
+"use strict";
 
-var _postcss = require('postcss');
+var _postcss = _interopRequireDefault(require("postcss"));
 
-var _postcss2 = _interopRequireDefault(_postcss);
+var _postcssHashClassname = _interopRequireDefault(require("postcss-hash-classname"));
 
-var _postcssHashClassname = require('postcss-hash-classname');
-
-var _postcssHashClassname2 = _interopRequireDefault(_postcssHashClassname);
-
-var _fs = require('fs');
-
-var _fs2 = _interopRequireDefault(_fs);
+var _fs = _interopRequireDefault(require("fs"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var count = 0;
-
+let count = 0;
 module.exports = {
-  process: function process(src) {
+  process: function (src) {
     count++;
-    var opts = { hashType: 'md5', digestType: 'base32' };
+    let opts = {
+      hashType: 'md5',
+      digestType: 'base32'
+    };
     opts.maxLength = 6;
     opts.type = '.json';
-    opts.outputName = 'jsonFile_test_' + count;
-    var processor = (0, _postcss2.default)([(0, _postcssHashClassname2.default)(opts)]);
+    opts.outputName = `jsonFile_test_${count}`;
+    let processor = (0, _postcss.default)([(0, _postcssHashClassname.default)(opts)]);
     processor.process(src).css;
-    var jsonMap = _fs2.default.readFileSync('jsonFile_test_' + count + '.json', 'UTF-8');
-    return 'module.exports =' + jsonMap;
+
+    let jsonMap = _fs.default.readFileSync(`jsonFile_test_${count}.json`, 'UTF-8');
+
+    return `module.exports =${jsonMap}`;
   }
 };

package/lib/jest/preProcessors/jsPreprocessor.js

@@ -1,11 +1,10 @@
-'use strict';
+"use strict";
 
-var _babelJest = require('babel-jest');
-
-var _babelJest2 = _interopRequireDefault(_babelJest);
+var _babelJest = _interopRequireDefault(require("babel-jest"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-module.exports = _babelJest2.default.createTransformer({
-  presets: [require.resolve('@babel/preset-env'), require.resolve('@babel/preset-react')]
+module.exports = _babelJest.default.createTransformer({
+  presets: [require.resolve('@babel/preset-env'), require.resolve('@babel/preset-react')],
+  plugins: [require.resolve('babel-plugin-transform-dynamic-import')]
 });

package/lib/jest/preProcessors/otherFilesPreprocessor.js

@@ -1,13 +1,12 @@
-'use strict';
+"use strict";
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
+var _path = _interopRequireDefault(require("path"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 module.exports = {
-  process: function process(src, filename) {
-    return 'module.exports = ' + JSON.stringify(_path2.default.basename(filename)) + ';';
+  process(src, filename) {
+    return `module.exports = ${JSON.stringify(_path.default.basename(filename))};`;
   }
+
 };

package/lib/jest/result.js

@@ -1,42 +1,46 @@
-'use strict';
+"use strict";
 
-var _fs = require('fs');
+var _fs = _interopRequireDefault(require("fs"));
 
-var _fs2 = _interopRequireDefault(_fs);
+var _utils = require("../utils");
 
-var _utils = require('../utils');
+var _jsonMaker = _interopRequireDefault(require("./jsonMaker"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var unitTestReport = [];
-var result = function result(inp) {
-  var testPathPattern = process.argv[process.argv.length - 1];
+let unitTestReport = [];
+
+const result = inp => {
+  inp.endTime = Date.now();
+  let testPathPattern = process.argv[process.argv.length - 1];
+
   if (testPathPattern.indexOf('--') !== -1) {
     testPathPattern = '';
   } else {
-    testPathPattern = _fs2.default.realpathSync(process.cwd());
+    testPathPattern = _fs.default.realpathSync(process.cwd());
   }
-  var testPathRegex = new RegExp(testPathPattern);
-  var testResults = inp.testResults;
 
-  var testFilesArr = [];
-  //  for (var i = 0; i < testResults.length; i++) {
-  testResults.forEach(function (testResult) {
-    var filePath = testResult.testFilePath;
+  let testPathRegex = new RegExp(testPathPattern);
+  let {
+    testResults
+  } = inp;
+  let testFilesArr = [];
+  testResults.forEach(testResult => {
+    let filePath = testResult.testFilePath;
+
     if (!testPathRegex.test(filePath)) {
       return;
     }
+
     filePath = filePath.replace('.spec', '');
     filePath = filePath.replace('/__tests__', '');
     filePath = filePath.replace('/__test__', '');
-    var fileJson = {};
+    let fileJson = {};
     fileJson.testPath = testResult.testFilePath;
     fileJson.sourcePath = filePath;
     fileJson.data = testResult;
     testFilesArr.push(fileJson);
-    testResult.testResults && testResult.testResults.filter(function (t) {
-      return t.status === 'failed';
-    }).forEach(function (t) {
+    testResult.testResults && testResult.testResults.filter(t => t.status === 'failed').forEach(t => {
       unitTestReport.push({
         title: t.title,
         fullName: t.fullName,
@@ -45,51 +49,97 @@ var result = function result(inp) {
     });
   });
 
-  var coverageSummary = _fs2.default.readFileSync('./coverage/coverage-summary.json').toString();
+  let coverageSummary = _fs.default.readFileSync('./coverage/coverage-summary.json').toString();
+
   if (coverageSummary.indexOf('\\') !== -1) {
     coverageSummary = coverageSummary.replace(/\\/g, '\\\\');
   }
-  var coverageJson = JSON.parse(coverageSummary);
-  var linesPercent = 0;
-  var functionPercent = 0;
-  var statementPerment = 0;
-  var branchesPercent = 0;
-  var i = 0;
+
+  let coverageJson = JSON.parse(coverageSummary);
+  let linesPercent = 0;
+  let functionPercent = 0;
+  let statementPerment = 0;
+  let branchesPercent = 0;
+  let i = 0;
+
   for (i; i < testFilesArr.length; i++) {
-    var curSourceFile = testFilesArr[i].sourcePath;
-    var coverageData = coverageJson[curSourceFile];
+    let curSourceFile = testFilesArr[i].sourcePath;
+    let coverageData = coverageJson[curSourceFile];
+
     if (!coverageData) {
-      (0, _utils.log)('Can\'t able to find source for ' + testFilesArr[i].testPath + '\n Or The spec file getting failed during test. Please check the file name and the path is correct for test file or Make them pass.');
+      (0, _utils.log)(`Can't able to find source for ${testFilesArr[i].testPath}\n Or The spec file getting failed during test. Please check the file name and the path is correct for test file or Make them pass.`);
       continue;
     }
+
     linesPercent += coverageData.lines.pct;
     functionPercent += coverageData.functions.pct;
     statementPerment += coverageData.statements.pct;
     branchesPercent += coverageData.branches.pct;
   }
-  var totalLinesPercent = linesPercent / (i * 100) * 100;
-  var totalFunctionPercent = functionPercent / (i * 100) * 100;
-  var totalStatementPercent = statementPerment / (i * 100) * 100;
-  var totalBranchesPercent = branchesPercent / (i * 100) * 100;
-  var totalPercentage = totalLinesPercent + totalFunctionPercent + totalStatementPercent + totalBranchesPercent;
-  var coverage = (totalPercentage / 4).toFixed(2);
+
+  let totalLinesPercent = linesPercent / (i * 100) * 100;
+  let totalFunctionPercent = functionPercent / (i * 100) * 100;
+  let totalStatementPercent = statementPerment / (i * 100) * 100;
+  let totalBranchesPercent = branchesPercent / (i * 100) * 100;
+  let totalPercentage = totalLinesPercent + totalFunctionPercent + totalStatementPercent + totalBranchesPercent;
+  let coverage = (totalPercentage / 4).toFixed(2);
   coverage = Number(coverage);
+  (0, _jsonMaker.default)(inp, coverage, 'Yes', 'unitcase');
 
   if (Number.isNaN(coverage)) {
     (0, _utils.log)('This build does\'t have any JS changes!');
     coverage = 0;
   } else {
-    (0, _utils.log)('COVERAGE ' + coverage + '%');
+    (0, _utils.log)(`COVERAGE ${coverage}%`);
   }
 
-  var html = '<html>\n\t<head>\n\t<style>\n\t.red{\n\t\tfont-weight:bold;\n\t\tcolor:red;\n\t}\n\t.green{\n\t\tfont-weight:bold;\n\t\tcolor:green;\n\t}\n\ttable\n\t\t{\n    font-family: arial, sans-serif;\n    border-collapse: collapse;\n\t\t}\n\n\t\ttd, th\n\t\t{\n    border: 1px solid #dddddd;\n    padding: 8px;\n\t\t}\n\t</style>\n\t</head>\n\t\t<body>\n\t\t\t<table>\n\t\t\t<tr>\n\t\t\t\t<th>Title</th>\n\t\t\t\t<th>FullName</th>\n\t\t\t\t<th>Test Case Path</th>\n\t\t\t</tr>\n\t\t\t' + unitTestReport.map(function (t) {
-    return '<tr>\n\t\t\t\t\t<td>' + t.title + '</td>\n\t\t\t\t\t<td>' + t.fullName + '</td>\n\t\t\t\t\t<td>' + t.filePath + '</td>\n\t\t\t\t</tr>';
-  }) + '\n\t\t\t</table>\n\t\t\t<br/>COVERAGE <span class="' + (coverage < 60 ? 'red' : 'green') + '">' + coverage + '%</span> <br/> less than 60% consider failure\n\t\t</body>\n\t</html>\n\t\t';
+  let html = `<html>
+	<head>
+	<style>
+	.red{
+		font-weight:bold;
+		color:red;
+	}
+	.green{
+		font-weight:bold;
+		color:green;
+	}
+	table
+		{
+    font-family: arial, sans-serif;
+    border-collapse: collapse;
+		}
+
+		td, th
+		{
+    border: 1px solid #dddddd;
+    padding: 8px;
+		}
+	</style>
+	</head>
+		<body>
+			<table>
+			<tr>
+				<th>Title</th>
+				<th>FullName</th>
+				<th>Test Case Path</th>
+			</tr>
+			${unitTestReport.map(t => `<tr>
+					<td>${t.title}</td>
+					<td>${t.fullName}</td>
+					<td>${t.filePath}</td>
+				</tr>`)}
+			</table>
+			<br/>COVERAGE <span class="${coverage < 60 ? 'red' : 'green'}">${coverage}%</span> <br/> less than 60% consider failure
+		</body>
+	</html>
+		`;
 
-  if (!_fs2.default.existsSync('./unittest')) {
-    _fs2.default.mkdirSync('./unittest');
+  if (!_fs.default.existsSync('./unittest')) {
+    _fs.default.mkdirSync('./unittest');
   }
-  _fs2.default.writeFileSync('./unittest/index.html', html, 'utf8');
+
+  _fs.default.writeFileSync('./unittest/index.html', html, 'utf8');
 
   return inp;
 };

package/lib/jest/run.js

@@ -1,45 +1,92 @@
-'use strict';
+"use strict";
 
-var _jest = require('jest');
+var _jest = require("jest");
 
-var _jest2 = _interopRequireDefault(_jest);
+var _fs = _interopRequireDefault(require("fs"));
 
-var _utils = require('../utils');
+var _utils = require("../utils");
 
-var _coverageCollector = require('./coverageCollector');
+var _jsonHelper = require("../utils/jsonHelper");
 
-var _coverageCollector2 = _interopRequireDefault(_coverageCollector);
+var _coverageCollector = _interopRequireDefault(require("./coverageCollector"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var options = (0, _utils.getOptions)();
-var folder = options.app.folder,
-    _options$test = options.test,
-    srcBranch = _options$test.srcBranch,
-    targetBranch = _options$test.targetBranch,
-    serviceName = _options$test.serviceName,
-    impactServerDomain = _options$test.impactServerDomain,
-    isCommitCoverage = _options$test.isCommitCoverage;
+let options = (0, _utils.getOptions)();
+let {
+  app: {
+    folder
+  },
+  test: {
+    branchName,
+    srcBranch,
+    targetBranch,
+    serviceName,
+    impactServerDomain,
+    isCommitCoverage
+  }
+} = options;
+let argv = process.argv.slice(2);
 
+let config = require('../configs/jest.config');
 
-var argv = process.argv.slice(2);
-
-var config = require('../configs/jest.config');
 if (isCommitCoverage) {
-  (0, _coverageCollector2.default)(srcBranch, targetBranch, serviceName, impactServerDomain).then(function () {
-    var res = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
+  (0, _coverageCollector.default)(srcBranch, targetBranch, serviceName, impactServerDomain).then((res = {}) => {
     if (res.STATUS) {
-      argv.push('--findRelatedTests');
-      argv = argv.concat(res.LIST);
-      argv = argv.concat(['--config', JSON.stringify(config(null, true))]);
-      argv.push('--no-cache');
-      _jest2.default.run(argv);
+      if (res.LIST.length > 0) {
+        let content = {
+          FILES: res.LIST
+        };
+
+        if (!_fs.default.existsSync('./coverageTest')) {
+          _fs.default.mkdirSync('./coverageTest');
+
+          _fs.default.writeFileSync('./coverageTest/result.json', JSON.stringify(content), 'utf8');
+        } else {
+          _fs.default.writeFileSync('./coverageTest/result.json', JSON.stringify(content), 'utf8');
+        }
+
+        argv.push('--findRelatedTests');
+        argv = argv.concat(res.LIST);
+        argv = argv.concat(['--config', JSON.stringify(config(null, true))]);
+        argv.push('--no-cache');
+        argv.push('--silent');
+        (0, _jest.run)(argv);
+      } else {
+        (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, ['tests', 'modifiedFileUnitCase', 'hasChanges'], false); // jsonHelper(
+        //   `${process.cwd()}/result.json`,
+        //   'testInfo.isBuildVerified',
+        //   true
+        // );
+
+        (0, _jsonHelper.setTestInfoStatus)(`${process.cwd()}/result.json`, true);
+        (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'testInfo.failures', [{
+          type: 'modifiedUnitcases',
+          message: res.REASON
+        }]);
+        (0, _utils.log)('No JS changes with last changeset!');
+      }
     } else {
+      (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, ['tests', 'modifiedFileUnitCase', 'isExecuted'], res.STATUS); // jsonHelper(
+      //     `${process.cwd()}/result.json`,
+      //     'testInfo.isBuildVerified',
+      //     true
+      // );
+
+      (0, _jsonHelper.setTestInfoStatus)(`${process.cwd()}/result.json`, true); // jsonHelper(`${process.cwd()}/result.json`, 'testInfo.failures', [{
+      //     type: 'modifiedUnitcases',
+      //     message: res.REASON
+      // }]);
+
       (0, _utils.log)(res.REASON);
     }
   });
 } else {
-  argv.push('--config', JSON.stringify(config(folder)), '--no-cache');
-  _jest2.default.run(argv);
+  if (branchName === 'master' || branchName === null) {
+    argv.push('--config', JSON.stringify(config(folder)), '--no-cache');
+    (0, _jest.run)(argv);
+  } else {
+    (0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, ['tests', 'unitCase', 'isExecuted'], 'onlyMaster');
+    (0, _utils.log)('Only runs with master branch');
+  }
 }