datagrok-tools 4.13.31 → 4.13.34

package/bin/commands/test.js

@@ -11,33 +11,32 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var _puppeteer = _interopRequireDefault(require("puppeteer"));
-var _puppeteerScreenRecorder = require("puppeteer-screen-recorder");
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
 var utils = _interopRequireWildcard(require("../utils/utils"));
 var color = _interopRequireWildcard(require("../utils/color-utils"));
-var testUtils = _interopRequireWildcard(require("../utils/test-utils"));
+var _testUtils = _interopRequireWildcard(require("../utils/test-utils"));
+var testUtils = _testUtils;
+var _orderFunctions = require("../utils/order-functions");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-/* eslint-disable max-len */
-
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /* eslint-disable max-len */
 var testInvocationTimeout = 3600000;
 var availableCommandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test', 'stress-test', 'link', 'tag'];
 var curDir = process.cwd();
 var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
 var consoleLogOutputDir = _path["default"].join(curDir, 'test-console-output.log');
-var browser;
-var page;
-var recorder;
+var csvReportDir = _path["default"].join(curDir, 'test-report.csv');
 function test(_x) {
   return _test.apply(this, arguments);
 }
 function _test() {
-  _test = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args) {
-    var config, packageJsonData, packageName, packagesDir, categoryToCheck, testToCheck, failed;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  _test = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(args) {
+    var config, packageJsonData, packageName, packagesDir, categoryToCheck, testToCheck, res;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
           config = _jsYaml["default"].load(_fs["default"].readFileSync(confPath, {
             encoding: 'utf-8'
@@ -60,24 +59,26 @@ function _test() {
           if (args.platform && packageName !== 'ApiTests') color.warn('--platform flag can only be used in the ApiTests package');
           if (args.core && packageName !== 'DevTools') color.warn('--core flag can only be used in the DevTools package');
           if (args["package"]) {
-            _context2.next = 16;
+            _context.next = 16;
             break;
           }
-          _context2.next = 16;
+          _context.next = 16;
           return testUtils.loadPackages(packagesDir, packageName, args.host, args['skip-publish'], args['skip-build'], args.link);
         case 16:
           process.env.TARGET_PACKAGE = packageName;
-          _context2.next = 19;
+          _context.next = 19;
           return runTesting(args, categoryToCheck, testToCheck);
         case 19:
-          failed = _context2.sent;
-          if (failed) testUtils.exitWithCode(1);else testUtils.exitWithCode(0);
-          return _context2.abrupt("return", true);
-        case 22:
+          res = _context.sent;
+          if (args.csv) (0, _testUtils.saveCsvResults)([res.csv], csvReportDir);
+          (0, _testUtils.printWorkersResult)(res, args.verbose);
+          if (!res) testUtils.exitWithCode(1);else testUtils.exitWithCode(0);
+          return _context.abrupt("return", true);
+        case 24:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _test.apply(this, arguments);
 }
@@ -92,232 +93,92 @@ function runTesting(_x2, _x3, _x4) {
   return _runTesting.apply(this, arguments);
 }
 function _runTesting() {
-  _runTesting = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(args, categoryToCheck, testToCheck) {
-    var r;
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  _runTesting = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(args, categoryToCheck, testToCheck) {
+    var _process$env$TARGET_P;
+    var testsObj, parsed, organized, filtered, _iterator, _step, element, testsResults, r, _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose, testsLeft, _iterator2, _step2, testData;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          color.info('Starting tests...');
-          _context3.next = 3;
-          return runTests(testInvocationTimeout, {
-            path: args.path,
-            verbose: args.verbose,
-            platform: args.platform,
-            catchUnhandled: args.catchUnhandled,
-            report: args.report,
-            record: args.record,
-            benchmark: args.benchmark,
-            core: args.core,
-            category: categoryToCheck,
-            test: testToCheck,
-            stressTest: args['stress-test'],
-            gui: args.gui
-          });
+          color.info('Loading tests...');
+          _context2.next = 3;
+          return (0, _testUtils.loadTestsList)([(_process$env$TARGET_P = process.env.TARGET_PACKAGE) !== null && _process$env$TARGET_P !== void 0 ? _process$env$TARGET_P : ''], args.core);
         case 3:
-          r = _context3.sent;
-          printResults(r, args.csv, args.verbose);
-          //@ts-ignore
-          if (!(browser != null)) {
-            _context3.next = 8;
-            break;
+          testsObj = _context2.sent;
+          parsed = (0, _orderFunctions.setAlphabeticalOrder)(testsObj, 1, 1);
+          organized = parsed[0].map(function (testObj) {
+            return {
+              "package": testObj.packageName,
+              params: {
+                category: testObj.category,
+                test: testObj.name,
+                options: {
+                  catchUnhandled: args.catchUnhandled,
+                  report: args.report
+                }
+              }
+            };
+          });
+          filtered = [];
+          if (args.category) {
+            _iterator = _createForOfIteratorHelper(organized);
+            try {
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                element = _step.value;
+                if (element.params.category === args.category) {
+                  if (element.params.test === args.test || !args.test) filtered.push(element);
+                }
+              }
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
+            }
+            organized = filtered;
           }
-          _context3.next = 8;
-          return browser.close();
-        case 8:
-          return _context3.abrupt("return", r.failed);
-        case 9:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return _runTesting.apply(this, arguments);
-}
-function runTests(timeout) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return testUtils.timeout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-    var params, out, addLogsToFile;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          addLogsToFile = function _addLogsToFile(msg) {
-            _fs["default"].appendFileSync(consoleLogOutputDir, "".concat(msg));
-          };
-          params = Object.assign({}, testUtils.defaultLaunchParameters);
-          if (options.gui) params['headless'] = false;
-          _context.next = 5;
-          return testUtils.getBrowserPage(_puppeteer["default"], params);
-        case 5:
-          out = _context.sent;
-          browser = out.browser;
-          page = out.page;
-          recorder = new _puppeteerScreenRecorder.PuppeteerScreenRecorder(page, testUtils.recorderConfig);
-          _context.next = 11;
-          return page.exposeFunction("addLogsToFile", addLogsToFile);
-        case 11:
-          if (!options.record) {
-            _context.next = 18;
-            break;
+          color.info('Starting tests...');
+          testsResults = [];
+        case 10:
+          _context2.next = 12;
+          return (0, _testUtils.runWorker)(organized, {
+            benchmark: (_args$benchmark = args.benchmark) !== null && _args$benchmark !== void 0 ? _args$benchmark : false,
+            catchUnhandled: (_args$catchUnhandled = args.catchUnhandled) !== null && _args$catchUnhandled !== void 0 ? _args$catchUnhandled : false,
+            gui: (_args$gui = args.gui) !== null && _args$gui !== void 0 ? _args$gui : false,
+            record: (_args$record = args.record) !== null && _args$record !== void 0 ? _args$record : false,
+            report: (_args$report = args.report) !== null && _args$report !== void 0 ? _args$report : false,
+            verbose: (_args$verbose = args.verbose) !== null && _args$verbose !== void 0 ? _args$verbose : false,
+            stopOnTimeout: true
+          }, 1, testInvocationTimeout);
+        case 12:
+          r = _context2.sent;
+          testsResults.push(r);
+          testsLeft = [];
+          _iterator2 = _createForOfIteratorHelper(organized);
+          try {
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              testData = _step2.value;
+              if (!r.csv.includes("".concat(testData.params.category, ",").concat(testData.params.test))) testsLeft.push(testData);
+            }
+          } catch (err) {
+            _iterator2.e(err);
+          } finally {
+            _iterator2.f();
           }
-          _fs["default"].writeFileSync(consoleLogOutputDir, "");
-          _context.next = 15;
-          return recorder.start('./test-record.mp4');
-        case 15:
-          page.on('console', function (msg) {
-            addLogsToFile("CONSOLE LOG ENTRY: ".concat(msg.text(), "\n"));
-          });
-          page.on('pageerror', function (error) {
-            addLogsToFile("CONSOLE LOG ERROR: ".concat(error.message, "\n"));
-          });
-          page.on('response', function (response) {
-            addLogsToFile("CONSOLE LOG REQUEST: ".concat(response.status(), ", ").concat(response.url(), "\n"));
-          });
+          organized = testsLeft;
         case 18:
-          _context.next = 20;
-          return runWorker(options);
-        case 20:
-          return _context.abrupt("return", _context.sent);
-        case 21:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), timeout);
-}
-function runWorker() {
-  return _runWorker.apply(this, arguments);
-}
-function _runWorker() {
-  _runWorker = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-    var _process$env$TARGET_P;
-    var options,
-      targetPackage,
-      r,
-      _args4 = arguments;
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          options = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
-          targetPackage = (_process$env$TARGET_P = process.env.TARGET_PACKAGE) !== null && _process$env$TARGET_P !== void 0 ? _process$env$TARGET_P : '#{PACKAGE_NAMESPACE}';
-          console.log("Testing ".concat(targetPackage, " package...\n"));
-          _context4.next = 5;
-          return page.evaluate(function (targetPackage, options, testContext) {
-            if (options.benchmark) window.DG.Test.isInBenchmark = true;
-            return new Promise(function (resolve, reject) {
-              var params = {
-                testContext: testContext,
-                category: options.category,
-                test: options.test
-              };
-              if (options.stressTest) params.stressTest = options.stressTest;
-              if (options.path) {
-                var split = options.path.split(' -- ');
-                params.category = split[0];
-                params.test = split[1];
-              }
-              if (targetPackage === 'DevTools') params.skipCore = options.core ? false : true;
-              params.verbose = options.verbose === true;
-              window.grok.functions.call("".concat(targetPackage, ":").concat(options.platform ? 'testPlatform' : 'test'), params).then(function (df) {
-                var failed = false;
-                var skipReport = '';
-                var passReport = '';
-                var failReport = '';
-                var countReport = {
-                  skip: 0,
-                  pass: 0
-                };
-                if (df == null) {
-                  failed = true;
-                  failReport = "Fail reason: No package tests found".concat(options.path ? ' for path "' + options.path + '"' : '');
-                  resolve({
-                    failReport: failReport,
-                    skipReport: skipReport,
-                    passReport: passReport,
-                    failed: failed,
-                    countReport: countReport
-                  });
-                  return;
-                }
-                var csv = df.toCsv();
-                var cStatus = df.columns.byName('success');
-                var cSkipped = df.columns.byName('skipped');
-                var cMessage = df.columns.byName('result');
-                var cCat = df.columns.byName('category');
-                var cName = df.columns.byName('name');
-                var cTime = df.columns.byName('ms');
-                for (var i = 0; i < df.rowCount; i++) {
-                  if (cStatus.get(i)) {
-                    if (cSkipped.get(i)) {
-                      skipReport += "Test result : Skipped : ".concat(cTime.get(i), " : ").concat(targetPackage, ".").concat(cCat.get(i), ".").concat(cName.get(i), " : ").concat(cMessage.get(i), "\n");
-                      countReport.skip += 1;
-                    } else {
-                      passReport += "Test result : Success : ".concat(cTime.get(i), " : ").concat(targetPackage, ".").concat(cCat.get(i), ".").concat(cName.get(i), " : ").concat(cMessage.get(i), "\n");
-                      countReport.pass += 1;
-                    }
-                  } else {
-                    failed = true;
-                    failReport += "Test result : Failed : ".concat(cTime.get(i), " : ").concat(targetPackage, ".").concat(cCat.get(i), ".").concat(cName.get(i), " : ").concat(cMessage.get(i), "\n");
-                  }
-                }
-                if (!options.verbose) df.rows.removeWhere(function (r) {
-                  return r.get('success');
-                });
-                resolve({
-                  failReport: failReport,
-                  skipReport: skipReport,
-                  passReport: passReport,
-                  failed: failed,
-                  csv: csv,
-                  countReport: countReport
-                });
-              })["catch"](function (e) {
-                var stack = window.DG.Logger.translateStackTrace(e.stack).then(function () {
-                  resolve({
-                    failReport: "".concat(e.message, "\n").concat(stack),
-                    skipReport: '',
-                    passReport: '',
-                    failed: true,
-                    csv: '',
-                    countReport: {
-                      skip: 0,
-                      pass: 0
-                    }
-                  });
-                });
-              });
-            });
-          }, targetPackage, options, new testUtils.TestContext(options.catchUnhandled, options.report));
-        case 5:
-          r = _context4.sent;
-          if (!options.record) {
-            _context4.next = 9;
+          if (r.verboseFailed.includes('EXECUTION TIMEOUT')) {
+            _context2.next = 10;
             break;
           }
-          _context4.next = 9;
-          return recorder.stop();
-        case 9:
-          return _context4.abrupt("return", r);
-        case 10:
+        case 19:
+          _context2.next = 21;
+          return (0, _testUtils.mergeWorkersResults)(testsResults);
+        case 21:
+          return _context2.abrupt("return", _context2.sent);
+        case 22:
         case "end":
-          return _context4.stop();
+          return _context2.stop();
       }
-    }, _callee4);
+    }, _callee2);
   }));
-  return _runWorker.apply(this, arguments);
-}
-function printResults(results) {
-  var csv = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var verbose = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  if (results.csv && csv) {
-    _fs["default"].writeFileSync(_path["default"].join(curDir, 'test-report.csv'), results.csv, 'utf8');
-    color.info('Saved `test-report.csv`\n');
-  }
-  if (results.passReport && verbose) console.log(results.passReport);else console.log('Passed tests: ' + results.countReport.pass);
-  if (results.skipReport && verbose) console.log(results.skipReport);else console.log('Skipped tests: ' + results.countReport.skip);
-  if (results.failed) {
-    console.log(results.failReport);
-    color.fail('Tests failed.');
-  } else {
-    color.success('Tests passed.');
-  }
+  return _runTesting.apply(this, arguments);
 }

package/bin/grok.js

@@ -15,7 +15,6 @@ const commands = {
   publish: require('./commands/publish').publish,
   test: require('./commands/test').test,
   testall: require('./commands/test-all').testAll,
-  publishall: require('./commands/publish-all').publishAll,
 };
 
 const command = argv['_'][0];