datagrok-tools 4.12.19 → 4.12.21

package/README.md

@@ -129,8 +129,10 @@ Read more about package development in [Datagrok's documentation](https://datagr
   | host           | Specify server alias                                                      |
   | record         | Records the test execution process in mp4 format                          |
   | report         | Sends a report on test results                                            |
-  | skip-build     | Skips package build step                                                   |
-  | skip-publish   | Skips package publish step                                                 |
+  | skip-build     | Skips package build step                                                  |
+  | skip-publish   | Skips package publish step                                                |
   | verbose        | Prints detailed information about passed and skipped tests in the console |
+  | platform       | Runs only platform tests (applicable for ApiTests package only)           |
+  | core           | Runs package & core tests (applicable  for DevTools package only)         |
 
 - `link` command is used for public plugins development to link `datagrok-api` and libraries.

package/bin/commands/help.js

@@ -12,7 +12,7 @@ var HELP_CONFIG = "\nUsage: grok config\n\nCreate or update a configuration file
 var HELP_CREATE = "\nUsage: grok create [name]\n\nCreate a package:\n\ngrok create         Create a package in the current working directory\ngrok create <name>  Create a package in a folder with the specified name\n\nPlease note that the package name may only include letters, numbers, underscores, or hyphens\n\nOptions:\n[--eslint] [--ide] [--js | --ts] [--test]\n\n--eslint    Add a configuration for eslint\n--ide       Add an IDE-specific configuration for debugging (vscode)\n--js        Create a JavaScript package\n--ts        Create a TypeScript package (default)\n--test      Add tests support (TypeScript packages only)\n";
 var HELP_PUBLISH = "\nUsage: grok publish [host]\n\nUpload a package\n\nOptions:\n[--build|--rebuild] [--debug|--release] [-k | --key] [--suffix]\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[--category] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--catchUnhandled] [--report] [--record] [--verbose]\n\n--category          Specify a category name 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 package author (default=false)\n--skip-build        Skip the package build step\n--skip-publish      Skip the package publication step\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n\nRun package tests\n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
+var HELP_TEST = "\nUsage: grok test\n\nOptions:\n[--category] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--catchUnhandled] [--report] [--record] [--verbose] [--platform]\n\n--category          Specify a category name 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 package author (default=false)\n--skip-build        Skip the package build step\n--skip-publish      Skip the package publication step\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 & core tests (applicable  for DevTools package only)\n\nRun package tests\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\nOptions:\n[--local | --npm]\n\n--local   Default. Links libraries and updates package scripts (\"link-all\", \"build-all\")\n--npm     Unlinks local packages and runs `npm i`\n";
 
 // const HELP_MIGRATE = `

package/bin/commands/test.js

@@ -24,7 +24,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 function test(args) {
   var options = Object.keys(args).slice(1);
-  var commandOptions = ['host', 'csv', 'gui', 'catchUnhandled', 'report', 'skip-build', 'skip-publish', 'category', 'record', 'verbose', 'benchmark'];
+  var commandOptions = ['host', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'category', 'record', 'verbose', 'benchmark'];
   var nArgs = args['_'].length;
   var curDir = process.cwd();
   var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
@@ -65,6 +65,14 @@ function test(args) {
     color.error('Invalid package name. Set the `name` field in `package.json`');
     return false;
   }
+  if (args.platform && process.env.TARGET_PACKAGE !== 'ApiTests') {
+    color.error('--platform flag can only be used in the ApiTests package');
+    return false;
+  }
+  if (args.core && process.env.TARGET_PACKAGE !== 'DevTools') {
+    color.error('--core flag can only be used in the DevTools package');
+    return false;
+  }
   if (args['skip-build']) {
     if (args['skip-publish']) test();else publish(test);
   } else build(args['skip-publish'] ? test : function () {
@@ -160,10 +168,12 @@ function test(args) {
               return page.evaluate(function (targetPackage, options, testContext) {
                 if (options.benchmark) window.DG.Test.isInBenchmark = true;
                 return new Promise(function (resolve, reject) {
-                  window.grok.functions.call("".concat(targetPackage, ":test"), {
-                    'category': options.category,
-                    'testContext': testContext
-                  }).then(function (df) {
+                  var params = {
+                    category: options.category,
+                    testContext: testContext
+                  };
+                  if (targetPackage === 'DevTools') params.skipCore = options.core ? false : true;
+                  window.grok.functions.call("".concat(targetPackage, ":").concat(options.platform ? 'testPlatform' : 'test'), params).then(function (df) {
                     var failed = false;
                     var skipReport = '';
                     var passReport = '';
@@ -273,10 +283,12 @@ function test(args) {
             return runTest(7200000, {
               category: args.category,
               verbose: args.verbose,
+              platform: args.platform,
               catchUnhandled: args.catchUnhandled,
               report: args.report,
               record: args.record,
-              benchmark: args.benchmark
+              benchmark: args.benchmark,
+              core: args.core
             });
           case 12:
             r = _context3.sent;

package/package.json

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