datagrok-tools 4.13.51 → 4.13.53

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Datagrok-tools changelog
 
+## 4.13.53 (2025-01-06)
+
+### Features
+
+* Updated csv output for test all(added workes id)
+
+
+## 4.13.52 (2024-12-30)
+
+### Features
+
+* Refactored workers to browsers
+
+
 ## 4.13.51 (2024-12-30)
 
 ### Features

package/bin/commands/help.js

@@ -13,7 +13,7 @@ var HELP_CREATE = "\nUsage: grok create [name]\n\nCreate a package:\n\ngrok crea
 var HELP_PUBLISH = "\nUsage: grok publish [host]\n\nUpload a package\n\nOptions:\n[--build|--rebuild] [--debug|--release] [-k | --key] [--suffix] [--all] [--refresh] [--link]\n\n--all             Publish all available packages \n--refresh         Publish all available already loaded packages \n--link  \t        Link the package to local utils\n\nRunning `grok publish` is the same as running `grok publish defaultHost --build --debug`\n";
 var HELP_CHECK = "\nUsage: grok check\n\nOptions:\n[-r | --recursive]\n\n--recursive       Check all packages in the current directory\n\nCheck package content (function signatures, import statements of external modules, etc.)\n";
 var HELP_TEST = "\nUsage: grok test\n\nOptions:\n[--package] [--category] [--test] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link] [--catchUnhandled] [--report] [--record] [--verbose] [--platform] [--benchmark] [--stress-test]\n\n--package           Specify a package name to run tests for\n--category          Specify a category name to run tests for\n--test              Specify a test name to run \n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies package author (default=false)\n--skip-build        Skip the package build step\n--skip-publish      Skip the package publication step\n--link  \t          Link the package to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--platform          Runs only platform tests (applicable for ApiTests package only)\n--core              Runs package & auto tests & core tests (core tests run only from DevTools package)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n \nRun package tests\n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
-var HELP_TESTALL = "\nUsage: grok testall\n\nOptions:\n[--packages] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link-package] [--catchUnhandled] [--report] [--record] [--verbose] [--benchmark] [--stress-test] [--order] [--tags] [--testRepeat] [--workers-count]\n\n--packages          Specify a packages names to run tests for\n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies packages author (default=false)\n--skip-build        Skip the packages build step\n--skip-publish      Skip the packages publication step\n--link-package  \t  Link the packages to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--core              Runs packages & core tests (applicable  for DevTools packages only)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n--order             Specify order for tests invocation\n--tags              Filter tests by tag name for run\n--testRepeat        Set amount of tests repeats\n--workers-count      Set amount of workers for tests run\n\nRun tests of all or specified packages \n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
+var HELP_TESTALL = "\nUsage: grok testall\n\nOptions:\n[--packages] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link-package] [--catchUnhandled] [--report] [--record] [--verbose] [--benchmark] [--stress-test] [--order] [--tags] [--testRepeat] [--browsers-count]\n\n--packages          Specify a packages names to run tests for\n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies packages author (default=false)\n--skip-build        Skip the packages build step\n--skip-publish      Skip the packages publication step\n--link-package  \t  Link the packages to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--core              Runs packages & core tests (applicable  for DevTools packages only)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n--order             Specify order for tests invocation\n--tags              Filter tests by tag name for run\n--testRepeat        Set amount of tests repeats\n--browsers-count      Set amount of browsers for tests run\n\nRun tests of all or specified packages \n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
 var HELP_LINK = "\nUsage: grok link\n\nLink `datagrok-api` and libraries for local development\n";
 
 // const HELP_MIGRATE = `

package/bin/commands/test-all.js

@@ -16,6 +16,7 @@ var utils = _interopRequireWildcard(require("../utils/utils"));
 var _testUtils = _interopRequireWildcard(require("../utils/test-utils"));
 var testUtils = _testUtils;
 var _orderFunctions = require("../utils/order-functions");
+var Papa = _interopRequireWildcard(require("papaparse"));
 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; }
 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; } } }; }
@@ -26,7 +27,7 @@ var order = /*#__PURE__*/function (order) {
   order[order["alphabetical"] = 1] = "alphabetical";
   order[order["packageRandom"] = 2] = "packageRandom";
   order[order["packageAlphabetical"] = 3] = "packageAlphabetical";
-  order[order["testToWorker"] = 4] = "testToWorker";
+  order[order["testToBrowser"] = 4] = "testToBrowser";
   return order;
 }(order || {});
 function getEnumOrder(orderStr) {
@@ -47,8 +48,8 @@ function getEnumOrder(orderStr) {
     case "packageatoz":
       return order.packageAlphabetical;
       break;
-    case "testtoworker":
-      return order.testToWorker;
+    case "testtobrowser":
+      return order.testToBrowser;
       break;
   }
   return order.random;
@@ -58,15 +59,15 @@ var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
 var csvReportDir = _path["default"].join(curDir, 'test-report.csv');
 var testInvocationTimeout = 7200000;
-var orderingFunctions = new Map([[order.random, _orderFunctions.setRandomOrder], [order.alphabetical, _orderFunctions.setAlphabeticalOrder], [order.packageRandom, _orderFunctions.setPackageRandomOrder], [order.packageAlphabetical, _orderFunctions.setPackageAlphabeticalOrder], [order.testToWorker, _orderFunctions.setTestToWorkerOrder]]);
-var workersStarted = 0;
+var orderingFunctions = new Map([[order.random, _orderFunctions.setRandomOrder], [order.alphabetical, _orderFunctions.setAlphabeticalOrder], [order.packageRandom, _orderFunctions.setPackageRandomOrder], [order.packageAlphabetical, _orderFunctions.setPackageAlphabeticalOrder], [order.testToBrowser, _orderFunctions.setTestToBrowserOrder]]);
+var browsersStarted = 0;
 function testAll(_x) {
   return _testAll.apply(this, arguments);
 }
 function _testAll() {
   _testAll = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(args) {
     var _args$tags, _args$order, _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose;
-    var config, packagesToRun, testsObj, filteredTests, workersOrder, testsResults, i, _iterator, _step, result;
+    var config, packagesToRun, testsObj, filteredTests, browsersOrder, testsResults, i, _iterator, _step, result;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -87,11 +88,11 @@ function _testAll() {
         case 10:
           filteredTests = _context.sent;
           _context.next = 13;
-          return setWorkersOrder(filteredTests, getEnumOrder((_args$order = args.order) !== null && _args$order !== void 0 ? _args$order : ''), args['workers-count'], args.testRepeat);
+          return setBrowsersOrder(filteredTests, getEnumOrder((_args$order = args.order) !== null && _args$order !== void 0 ? _args$order : ''), args['browsers-count'], args.testRepeat);
         case 13:
-          workersOrder = _context.sent;
+          browsersOrder = _context.sent;
           _context.next = 16;
-          return runTests(workersOrder, {
+          return runTests(browsersOrder, {
             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,
@@ -106,8 +107,8 @@ function _testAll() {
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               result = _step.value;
-              console.log("\nWorker #".concat(i++, " "));
-              (0, _testUtils.printWorkersResult)(result, args.verbose);
+              console.log("\nBrowser #".concat(i++, " "));
+              (0, _testUtils.printBrowsersResult)(result, args.verbose);
             }
           } catch (err) {
             _iterator.e(err);
@@ -228,13 +229,13 @@ function _filterTests() {
   }));
   return _filterTests.apply(this, arguments);
 }
-function setWorkersOrder(_x4) {
-  return _setWorkersOrder.apply(this, arguments);
+function setBrowsersOrder(_x4) {
+  return _setBrowsersOrder.apply(this, arguments);
 }
-function _setWorkersOrder() {
-  _setWorkersOrder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(tests) {
+function _setBrowsersOrder() {
+  _setBrowsersOrder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(tests) {
     var invocationOrder,
-      countOfWorkers,
+      countOfBrowsers,
       testRepeats,
       resultOrder,
       orderingFunction,
@@ -243,7 +244,7 @@ function _setWorkersOrder() {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           invocationOrder = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : 0;
-          countOfWorkers = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : 1;
+          countOfBrowsers = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : 1;
           testRepeats = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : 1;
           resultOrder = [];
           orderingFunction = orderingFunctions.get(invocationOrder);
@@ -251,7 +252,7 @@ function _setWorkersOrder() {
             _context4.next = 9;
             break;
           }
-          resultOrder = orderingFunction(tests, countOfWorkers, testRepeats);
+          resultOrder = orderingFunction(tests, countOfBrowsers, testRepeats);
           _context4.next = 10;
           break;
         case 9:
@@ -264,31 +265,31 @@ function _setWorkersOrder() {
       }
     }, _callee3);
   }));
-  return _setWorkersOrder.apply(this, arguments);
+  return _setBrowsersOrder.apply(this, arguments);
 }
 function runTests(_x5, _x6) {
   return _runTests.apply(this, arguments);
 }
 function _runTests() {
-  _runTests = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(workersOrder, workerOptions) {
-    var workersCommands, _iterator3, _step3, workerOrder, workersPromises, _i, _workersCommands, workerCommands, resultObjects;
+  _runTests = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(browsersOrder, browserOptions) {
+    var browsersCommands, _iterator3, _step3, browserOrder, browsersPromises, _i, _browsersCommands, browserCommands, resultObjects, i;
     return _regenerator["default"].wrap(function _callee4$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          workersCommands = [];
-          _iterator3 = _createForOfIteratorHelper(workersOrder);
+          browsersCommands = [];
+          _iterator3 = _createForOfIteratorHelper(browsersOrder);
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              workerOrder = _step3.value;
-              workersCommands.push(workerOrder.map(function (testObj) {
+              browserOrder = _step3.value;
+              browsersCommands.push(browserOrder.map(function (testObj) {
                 return {
                   "package": testObj.packageName,
                   params: {
                     category: testObj.category,
                     test: testObj.name,
                     options: {
-                      catchUnhandled: workerOptions.catchUnhandled,
-                      report: workerOptions.report
+                      catchUnhandled: browserOptions.catchUnhandled,
+                      report: browserOptions.report
                     }
                   }
                 };
@@ -299,21 +300,68 @@ function _runTests() {
           } finally {
             _iterator3.f();
           }
-          workersPromises = [];
-          for (_i = 0, _workersCommands = workersCommands; _i < _workersCommands.length; _i++) {
-            workerCommands = _workersCommands[_i];
-            workersPromises.push((0, _testUtils.runWorker)(workerCommands, workerOptions, workersStarted++, testInvocationTimeout));
+          browsersPromises = [];
+          for (_i = 0, _browsersCommands = browsersCommands; _i < _browsersCommands.length; _i++) {
+            browserCommands = _browsersCommands[_i];
+            browsersPromises.push((0, _testUtils.runBrowser)(browserCommands, browserOptions, browsersStarted++, testInvocationTimeout));
           }
           _context5.next = 7;
-          return Promise.all(workersPromises);
+          return Promise.all(browsersPromises);
         case 7:
           resultObjects = _context5.sent;
-          return _context5.abrupt("return", resultObjects);
+          i = 0;
         case 9:
+          if (!(i < resultObjects.length)) {
+            _context5.next = 16;
+            break;
+          }
+          _context5.next = 12;
+          return addBrowserColumn(resultObjects[i].csv, i);
+        case 12:
+          resultObjects[i].csv = _context5.sent;
+        case 13:
+          i++;
+          _context5.next = 9;
+          break;
+        case 16:
+          return _context5.abrupt("return", resultObjects);
+        case 17:
         case "end":
           return _context5.stop();
       }
     }, _callee4);
   }));
   return _runTests.apply(this, arguments);
+}
+function addBrowserColumn(_x7, _x8) {
+  return _addBrowserColumn.apply(this, arguments);
+}
+function _addBrowserColumn() {
+  _addBrowserColumn = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(csv, workerNumber) {
+    var result;
+    return _regenerator["default"].wrap(function _callee5$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          result = "";
+          Papa.parse(csv, {
+            header: true,
+            skipEmptyLines: true,
+            complete: function complete(results) {
+              var dataWithDefaultColumn = results.data.map(function (row) {
+                row["worker"] = workerNumber;
+                return row;
+              });
+              result = Papa.unparse(dataWithDefaultColumn, {
+                header: true
+              });
+            }
+          });
+          return _context6.abrupt("return", result);
+        case 3:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee5);
+  }));
+  return _addBrowserColumn.apply(this, arguments);
 }

package/bin/commands/test.js

@@ -67,7 +67,7 @@ function _test() {
         case 15:
           res = _context.sent;
           if (args.csv) (0, _testUtils.saveCsvResults)([res.csv], csvReportDir);
-          (0, _testUtils.printWorkersResult)(res, args.verbose);
+          (0, _testUtils.printBrowsersResult)(res, args.verbose);
           if (res.failed) testUtils.exitWithCode(1);else testUtils.exitWithCode(0);
           return _context.abrupt("return", true);
         case 20:
@@ -91,7 +91,7 @@ function runTesting(_x2) {
 function _runTesting() {
   _runTesting = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(args) {
     var _process$env$TARGET_P, _args$category;
-    var testsObj, parsed, organized, filtered, categoryRegex, _iterator, _step, element, testsResults, r, workerId;
+    var testsObj, parsed, organized, filtered, categoryRegex, _iterator, _step, element, testsResults, r, browserId;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -153,7 +153,7 @@ function _runTesting() {
           }
           color.info('Starting tests...');
           testsResults = [];
-          workerId = 1;
+          browserId = 1;
           _context3.next = 17;
           return (0, _testUtils.timeout)( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose, _args$ciCd, testsLeft, testsToReproduce, _iterator2, _step2, testData, reproduced, _iterator3, _step3, _test2, _reproducedTest2;
@@ -161,7 +161,7 @@ function _runTesting() {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   _context2.next = 2;
-                  return (0, _testUtils.runWorker)(organized, {
+                  return (0, _testUtils.runBrowser)(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,
@@ -170,7 +170,7 @@ function _runTesting() {
                     verbose: (_args$verbose = args.verbose) !== null && _args$verbose !== void 0 ? _args$verbose : false,
                     ciCd: (_args$ciCd = args['ci-cd']) !== null && _args$ciCd !== void 0 ? _args$ciCd : false,
                     stopOnTimeout: true
-                  }, workerId, testInvocationTimeout);
+                  }, browserId, testInvocationTimeout);
                 case 2:
                   r = _context2.sent;
                   testsLeft = [];
@@ -232,7 +232,7 @@ function _runTesting() {
                 case 31:
                   testsResults.push(r);
                   organized = testsLeft;
-                  workerId++;
+                  browserId++;
                 case 34:
                   if (r.failed) {
                     _context2.next = 0;
@@ -246,7 +246,7 @@ function _runTesting() {
           })), testInvocationTimeout);
         case 17:
           _context3.next = 19;
-          return (0, _testUtils.mergeWorkersResults)(testsResults);
+          return (0, _testUtils.mergeBrowsersResults)(testsResults);
         case 19:
           return _context3.abrupt("return", _context3.sent);
         case 20:
@@ -277,7 +277,7 @@ function _reproducedTest() {
           }
           _test3 = _step4.value;
           _context4.next = 8;
-          return (0, _testUtils.runWorker)([_test3], {
+          return (0, _testUtils.runBrowser)([_test3], {
             benchmark: (_args$benchmark2 = args.benchmark) !== null && _args$benchmark2 !== void 0 ? _args$benchmark2 : false,
             catchUnhandled: false,
             gui: false,

package/bin/utils/order-functions.js

@@ -8,7 +8,7 @@ exports.setAlphabeticalOrder = setAlphabeticalOrder;
 exports.setPackageAlphabeticalOrder = setPackageAlphabeticalOrder;
 exports.setPackageRandomOrder = setPackageRandomOrder;
 exports.setRandomOrder = setRandomOrder;
-exports.setTestToWorkerOrder = setTestToWorkerOrder;
+exports.setTestToBrowserOrder = setTestToBrowserOrder;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -16,15 +16,15 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
-function setRandomOrder(tests, workersAmount, testRepeats) {
-  if (workersAmount > tests.length) workersAmount = tests.length;
+function setRandomOrder(tests, browsersAmount, testRepeats) {
+  if (browsersAmount > tests.length) browsersAmount = tests.length;
   var repeatedTests = repeatTests(tests, testRepeats);
   var orderedTests = shuffle(repeatedTests);
-  return splitArray(orderedTests, workersAmount);
+  return splitArray(orderedTests, browsersAmount);
 }
-function setPackageRandomOrder(tests, workersAmount, testRepeats) {
+function setPackageRandomOrder(tests, browsersAmount, testRepeats) {
   var packages = splitTestsByPackages(tests);
-  if (workersAmount > packages.size) workersAmount = packages.size;
+  if (browsersAmount > packages.size) browsersAmount = packages.size;
   var _iterator = _createForOfIteratorHelper(packages.keys()),
     _step;
   try {
@@ -38,7 +38,7 @@ function setPackageRandomOrder(tests, workersAmount, testRepeats) {
   } finally {
     _iterator.f();
   }
-  var splittedPackagesArray = splitArray((0, _toConsumableArray2["default"])(packages.values()), workersAmount);
+  var splittedPackagesArray = splitArray((0, _toConsumableArray2["default"])(packages.values()), browsersAmount);
   var splittedTestsArray = [];
   for (var _i = 0, _splittedPackagesArra = splittedPackagesArray; _i < _splittedPackagesArra.length; _i++) {
     var _splitArray = _splittedPackagesArra[_i];
@@ -59,17 +59,17 @@ function setPackageRandomOrder(tests, workersAmount, testRepeats) {
   }
   return splittedTestsArray;
 }
-function setAlphabeticalOrder(tests, workersAmount, testRepeats) {
-  if (workersAmount > tests.length) workersAmount = tests.length;
+function setAlphabeticalOrder(tests, browsersAmount, testRepeats) {
+  if (browsersAmount > tests.length) browsersAmount = tests.length;
   var repeatedTests = repeatTests(tests, testRepeats);
   var orderedTests = repeatedTests.sort(function (test1, test2) {
     return "".concat(test1.category, ": ").concat(test1.name, "s").localeCompare("".concat(test2.category, ": ").concat(test2.name, "s"));
   });
-  return splitArray(orderedTests, workersAmount);
+  return splitArray(orderedTests, browsersAmount);
 }
-function setPackageAlphabeticalOrder(tests, workersAmount, testRepeats) {
+function setPackageAlphabeticalOrder(tests, browsersAmount, testRepeats) {
   var packages = splitTestsByPackages(tests);
-  if (workersAmount > packages.size) workersAmount = packages.size;
+  if (browsersAmount > packages.size) browsersAmount = packages.size;
   var _iterator3 = _createForOfIteratorHelper(packages.keys()),
     _step3;
   try {
@@ -83,7 +83,7 @@ function setPackageAlphabeticalOrder(tests, workersAmount, testRepeats) {
   } finally {
     _iterator3.f();
   }
-  var splittedPackagesArray = splitArray((0, _toConsumableArray2["default"])(packages.values()), workersAmount);
+  var splittedPackagesArray = splitArray((0, _toConsumableArray2["default"])(packages.values()), browsersAmount);
   var splittedTestsArray = [];
   for (var _i2 = 0, _splittedPackagesArra2 = splittedPackagesArray; _i2 < _splittedPackagesArra2.length; _i2++) {
     var _splitArray2 = _splittedPackagesArra2[_i2];
@@ -104,16 +104,25 @@ function setPackageAlphabeticalOrder(tests, workersAmount, testRepeats) {
   }
   return splittedTestsArray;
 }
-function setTestToWorkerOrder(tests, workersAmount, testRepeats) {
+function setTestToBrowserOrder(tests, browsersAmount, testRepeats) {
   var splittedTestsArray = [];
-  if (workersAmount > tests.length) workersAmount = tests.length;
-  for (var i = 0; i < workersAmount; i++) {
-    var orderedTests = shuffle(tests);
+  if (browsersAmount > tests.length) browsersAmount = tests.length;
+  var orderedTests = shuffle(tests);
+  for (var i = 0; i < browsersAmount; i++) {
     splittedTestsArray.push([]);
-    for (var _i3 = 0, _orderedTests = orderedTests; _i3 < _orderedTests.length; _i3++) {
-      var test = _orderedTests[_i3];
-      splittedTestsArray[splittedTestsArray.length - 1].push(_objectSpread({}, test));
+    var _iterator5 = _createForOfIteratorHelper(orderedTests),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var test = _step5.value;
+        splittedTestsArray[splittedTestsArray.length - 1].push(_objectSpread({}, test));
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
     }
+    splittedTestsArray[splittedTestsArray.length - 1] = shuffle(repeatTests(splittedTestsArray[splittedTestsArray.length - 1], testRepeats));
   }
   return splittedTestsArray;
 }
@@ -122,35 +131,35 @@ function alphabeticalSortFunction(test1, test2) {
 }
 function splitTestsByPackages(tests) {
   var resultMap = new Map();
-  var _iterator5 = _createForOfIteratorHelper(tests),
-    _step5;
+  var _iterator6 = _createForOfIteratorHelper(tests),
+    _step6;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var test = _step5.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var test = _step6.value;
       if (resultMap.has(test.packageName)) resultMap.get(test.packageName).push(test);else resultMap.set(test.packageName, [test]);
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator5.f();
+    _iterator6.f();
   }
   return resultMap;
 }
 function repeatTests(tests, testRepeats) {
   var repeatedTests = [];
-  var _iterator6 = _createForOfIteratorHelper(tests),
-    _step6;
+  var _iterator7 = _createForOfIteratorHelper(tests),
+    _step7;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var test = _step6.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var test = _step7.value;
       for (var i = 0; i < testRepeats; i++) {
         repeatedTests.push(_objectSpread({}, test));
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator6.f();
+    _iterator7.f();
   }
   return repeatedTests;
 }

package/bin/utils/test-utils.js

@@ -15,11 +15,11 @@ exports.getToken = getToken;
 exports.getWebUrl = getWebUrl;
 exports.loadPackages = loadPackages;
 exports.loadTestsList = loadTestsList;
-exports.mergeWorkersResults = mergeWorkersResults;
-exports.printWorkersResult = printWorkersResult;
+exports.mergeBrowsersResults = mergeBrowsersResults;
+exports.printBrowsersResult = printBrowsersResult;
 exports.recorderConfig = void 0;
+exports.runBrowser = runBrowser;
 exports.runWithTimeout = runWithTimeout;
-exports.runWorker = runWorker;
 exports.saveCsvResults = saveCsvResults;
 exports.timeout = timeout;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -575,28 +575,28 @@ function _loadTestsList() {
 function addLogsToFile(filePath, stringToSave) {
   _fs["default"].appendFileSync(filePath, "".concat(stringToSave));
 }
-function printWorkersResult(workerResult) {
-  var _workerResult$failedA, _workerResult$verbose3;
+function printBrowsersResult(browserResult) {
+  var _browserResult$failed, _browserResult$verbos3;
   var verbose = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (verbose) {
-    var _workerResult$passedA, _workerResult$verbose, _workerResult$skipped, _workerResult$verbose2;
-    if (((_workerResult$passedA = workerResult.passedAmount) !== null && _workerResult$passedA !== void 0 ? _workerResult$passedA : 0) > 0 && ((_workerResult$verbose = workerResult.verbosePassed) !== null && _workerResult$verbose !== void 0 ? _workerResult$verbose : []).length > 0) {
+    var _browserResult$passed, _browserResult$verbos, _browserResult$skippe, _browserResult$verbos2;
+    if (((_browserResult$passed = browserResult.passedAmount) !== null && _browserResult$passed !== void 0 ? _browserResult$passed : 0) > 0 && ((_browserResult$verbos = browserResult.verbosePassed) !== null && _browserResult$verbos !== void 0 ? _browserResult$verbos : []).length > 0) {
       console.log("Passed: ");
-      console.log(workerResult.verbosePassed);
+      console.log(browserResult.verbosePassed);
     }
-    if (((_workerResult$skipped = workerResult.skippedAmount) !== null && _workerResult$skipped !== void 0 ? _workerResult$skipped : 0) > 0 && ((_workerResult$verbose2 = workerResult.verboseSkipped) !== null && _workerResult$verbose2 !== void 0 ? _workerResult$verbose2 : []).length > 0) {
+    if (((_browserResult$skippe = browserResult.skippedAmount) !== null && _browserResult$skippe !== void 0 ? _browserResult$skippe : 0) > 0 && ((_browserResult$verbos2 = browserResult.verboseSkipped) !== null && _browserResult$verbos2 !== void 0 ? _browserResult$verbos2 : []).length > 0) {
       console.log("Skipped: ");
-      console.log(workerResult.verboseSkipped);
+      console.log(browserResult.verboseSkipped);
     }
   }
-  if (((_workerResult$failedA = workerResult.failedAmount) !== null && _workerResult$failedA !== void 0 ? _workerResult$failedA : 0) > 0 && ((_workerResult$verbose3 = workerResult.verboseFailed) !== null && _workerResult$verbose3 !== void 0 ? _workerResult$verbose3 : []).length > 0) {
+  if (((_browserResult$failed = browserResult.failedAmount) !== null && _browserResult$failed !== void 0 ? _browserResult$failed : 0) > 0 && ((_browserResult$verbos3 = browserResult.verboseFailed) !== null && _browserResult$verbos3 !== void 0 ? _browserResult$verbos3 : []).length > 0) {
     console.log("Failed: ");
-    console.log(workerResult.verboseFailed);
+    console.log(browserResult.verboseFailed);
   }
-  console.log("Passed amount:  " + (workerResult === null || workerResult === void 0 ? void 0 : workerResult.passedAmount));
-  console.log("Skipped amount: " + (workerResult === null || workerResult === void 0 ? void 0 : workerResult.skippedAmount));
-  console.log("Failed amount:  " + (workerResult === null || workerResult === void 0 ? void 0 : workerResult.failedAmount));
-  if (workerResult.failed) {
+  console.log("Passed amount:  " + (browserResult === null || browserResult === void 0 ? void 0 : browserResult.passedAmount));
+  console.log("Skipped amount: " + (browserResult === null || browserResult === void 0 ? void 0 : browserResult.skippedAmount));
+  console.log("Failed amount:  " + (browserResult === null || browserResult === void 0 ? void 0 : browserResult.failedAmount));
+  if (browserResult.failed) {
     color.fail('Tests failed.');
   } else {
     color.success('Tests passed.');
@@ -610,11 +610,11 @@ function saveCsvResults(stringToSave, csvReportDir) {
   _fs["default"].writeFileSync(csvReportDir, modifiedStrings.join('\n'), 'utf8');
   color.info('Saved `test-report.csv`\n');
 }
-function runWorker(_x18, _x19, _x20) {
-  return _runWorker.apply(this, arguments);
+function runBrowser(_x18, _x19, _x20) {
+  return _runBrowser.apply(this, arguments);
 }
-function _runWorker() {
-  _runWorker = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(testExecutionData, workerOptions, workersId) {
+function _runBrowser() {
+  _runBrowser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(testExecutionData, browserOptions, browsersId) {
     var testInvocationTimeout,
       _args10 = arguments;
     return _regenerator["default"].wrap(function _callee10$(_context10) {
@@ -623,12 +623,12 @@ function _runWorker() {
           testInvocationTimeout = _args10.length > 3 && _args10[3] !== undefined ? _args10[3] : 3600000;
           _context10.next = 3;
           return timeout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
-            var params, out, browser, page, recorder, currentWorkerNum, logsDir, recordDir, testingResults;
+            var params, out, browser, page, recorder, currentBrowserNum, logsDir, recordDir, testingResults;
             return _regenerator["default"].wrap(function _callee9$(_context9) {
               while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   params = Object.assign({}, defaultLaunchParameters);
-                  if (workerOptions.gui) params['headless'] = false;
+                  if (browserOptions.gui) params['headless'] = false;
                   _context9.next = 4;
                   return getBrowserPage(_puppeteer["default"], params);
                 case 4:
@@ -636,10 +636,10 @@ function _runWorker() {
                   browser = out.browser;
                   page = out.page;
                   recorder = new _puppeteerScreenRecorder.PuppeteerScreenRecorder(page, recorderConfig);
-                  currentWorkerNum = workersId;
-                  logsDir = "./test-console-output-".concat(currentWorkerNum, ".log");
-                  recordDir = "./test-record-".concat(currentWorkerNum, ".mp4");
-                  if (!workerOptions.record) {
+                  currentBrowserNum = browsersId;
+                  logsDir = "./test-console-output-".concat(currentBrowserNum, ".log");
+                  recordDir = "./test-record-".concat(currentBrowserNum, ".mp4");
+                  if (!browserOptions.record) {
                     _context9.next = 20;
                     break;
                   }
@@ -682,10 +682,10 @@ function _runWorker() {
                         });
                       });
                     });
-                  }, testExecutionData, workerOptions);
+                  }, testExecutionData, browserOptions);
                 case 22:
                   testingResults = _context9.sent;
-                  if (!workerOptions.record) {
+                  if (!browserOptions.record) {
                     _context9.next = 26;
                     break;
                   }
@@ -714,28 +714,28 @@ function _runWorker() {
       }
     }, _callee10);
   }));
-  return _runWorker.apply(this, arguments);
+  return _runBrowser.apply(this, arguments);
 }
-function mergeWorkersResults(_x21) {
-  return _mergeWorkersResults.apply(this, arguments);
+function mergeBrowsersResults(_x21) {
+  return _mergeBrowsersResults.apply(this, arguments);
 }
-function _mergeWorkersResults() {
-  _mergeWorkersResults = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(workersResults) {
-    var mergedResult, _iterator5, _step5, workersResult, resultToMerdge1, resultToMerdge2, header;
+function _mergeBrowsersResults() {
+  _mergeBrowsersResults = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(browsersResults) {
+    var mergedResult, _iterator5, _step5, browsersResult, resultToMerdge1, resultToMerdge2, header;
     return _regenerator["default"].wrap(function _callee11$(_context11) {
       while (1) switch (_context11.prev = _context11.next) {
         case 0:
           mergedResult = {
-            failed: workersResults[0].failed,
-            verbosePassed: workersResults[0].verbosePassed,
-            verboseSkipped: workersResults[0].verboseSkipped,
-            verboseFailed: workersResults[0].verboseFailed,
-            passedAmount: workersResults[0].passedAmount,
-            skippedAmount: workersResults[0].skippedAmount,
-            failedAmount: workersResults[0].failedAmount,
-            csv: workersResults[0].csv
+            failed: browsersResults[0].failed,
+            verbosePassed: browsersResults[0].verbosePassed,
+            verboseSkipped: browsersResults[0].verboseSkipped,
+            verboseFailed: browsersResults[0].verboseFailed,
+            passedAmount: browsersResults[0].passedAmount,
+            skippedAmount: browsersResults[0].skippedAmount,
+            failedAmount: browsersResults[0].failedAmount,
+            csv: browsersResults[0].csv
           };
-          _iterator5 = _createForOfIteratorHelper(workersResults);
+          _iterator5 = _createForOfIteratorHelper(browsersResults);
           _context11.prev = 2;
           _iterator5.s();
         case 4:
@@ -743,22 +743,22 @@ function _mergeWorkersResults() {
             _context11.next = 21;
             break;
           }
-          workersResult = _step5.value;
-          if (!(mergedResult.csv === workersResult.csv)) {
+          browsersResult = _step5.value;
+          if (!(mergedResult.csv === browsersResult.csv)) {
             _context11.next = 8;
             break;
           }
           return _context11.abrupt("continue", 19);
         case 8:
-          mergedResult.failed = mergedResult.failed && workersResult.failed;
-          mergedResult.verbosePassed = "".concat(mergedResult.verbosePassed.trim(), "\n").concat(workersResult.verbosePassed.trim());
-          mergedResult.verboseFailed = "".concat(mergedResult.verboseFailed.trim(), "\n").concat(workersResult.verboseFailed.trim());
-          mergedResult.verboseSkipped = "".concat(mergedResult.verboseSkipped.trim(), "\n").concat(workersResult.verboseSkipped.trim());
-          mergedResult.passedAmount += workersResult.passedAmount;
-          mergedResult.failedAmount += workersResult.failedAmount;
-          mergedResult.skippedAmount += workersResult.skippedAmount;
+          mergedResult.failed = mergedResult.failed && browsersResult.failed;
+          mergedResult.verbosePassed = "".concat(mergedResult.verbosePassed.trim(), "\n").concat(browsersResult.verbosePassed.trim());
+          mergedResult.verboseFailed = "".concat(mergedResult.verboseFailed.trim(), "\n").concat(browsersResult.verboseFailed.trim());
+          mergedResult.verboseSkipped = "".concat(mergedResult.verboseSkipped.trim(), "\n").concat(browsersResult.verboseSkipped.trim());
+          mergedResult.passedAmount += browsersResult.passedAmount;
+          mergedResult.failedAmount += browsersResult.failedAmount;
+          mergedResult.skippedAmount += browsersResult.skippedAmount;
           resultToMerdge1 = mergedResult.csv.trim().split('\n');
-          resultToMerdge2 = workersResult.csv.trim().split('\n');
+          resultToMerdge2 = browsersResult.csv.trim().split('\n');
           header = resultToMerdge1[0];
           mergedResult.csv = [header].concat((0, _toConsumableArray2["default"])(resultToMerdge1.slice(1)), (0, _toConsumableArray2["default"])(resultToMerdge2.slice(1))).join('\n');
         case 19:
@@ -783,7 +783,7 @@ function _mergeWorkersResults() {
       }
     }, _callee11, null, [[2, 23, 26, 29]]);
   }));
-  return _mergeWorkersResults.apply(this, arguments);
+  return _mergeBrowsersResults.apply(this, arguments);
 }
 var TestContext = exports.TestContext = /*#__PURE__*/(0, _createClass2["default"])(function TestContext(catchUnhandled, report) {
   (0, _classCallCheck2["default"])(this, TestContext);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.13.51",
+  "version": "4.13.53",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {