@testim/testim-cli 3.198.0 → 3.199.0

package/npm-shrinkwrap.json

@@ -2033,9 +2033,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001278",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001278.tgz",
-      "integrity": "sha512-mpF9KeH8u5cMoEmIic/cr7PNS+F5LWBk0t2ekGT60lFf0Wq+n9LspAj0g3P+o7DQhD3sUdlMln4YFAWhFYn9jg==",
+      "version": "1.0.30001279",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001279.tgz",
+      "integrity": "sha512-VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ==",
       "dev": true
     },
     "caseless": {
@@ -2200,9 +2200,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "16.11.6",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
-          "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
+          "version": "16.11.7",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
+          "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
         },
         "mkdirp": {
           "version": "0.5.5",
@@ -3172,9 +3172,9 @@
       "integrity": "sha512-GJCAeDBKfREgkBtgrYSf9hQy9kTb3helv0zGdzqhM7iAkW8FA/ZF97VQDbwFiwIT8MQLLOe5VlPZOEvZAqtUAQ=="
     },
     "electron-to-chromium": {
-      "version": "1.3.890",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.890.tgz",
-      "integrity": "sha512-VWlVXSkv0cA/OOehrEyqjUTHwV8YXCPTfPvbtoeU2aHR21vI4Ejh5aC4AxUwOmbLbBgb6Gd3URZahoCxtBqCYQ==",
+      "version": "1.3.892",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.892.tgz",
+      "integrity": "sha512-YDW4yIjdfMnbRoBjRZ/aNQYmT6JgQFLwmTSDRJMQdrY4MByEzppdXp3rnJ0g4LBWcsYTUvwKKClYN1ofZ0COOQ==",
       "dev": true
     },
     "emoji-regex": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.198.0",
+  "version": "3.199.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{

package/reports/consoleReporter.js

@@ -7,6 +7,8 @@ const constants = require('../commons/constants');
 const featureAvailabilityService = require('../commons/featureAvailabilityService');
 const { getAbortedTests, getFailedTests, getPassedTests, getFailureEvaluatingCount, getSkippedCount } = require('./reporterUtils');
 
+const colorize = { success: chalk.green, warn: chalk.yellow, error: chalk.red };
+
 class ConsoleReporter {
     constructor(options, branchToUse) {
         this.options = options;
@@ -16,12 +18,8 @@ class ConsoleReporter {
         this.branchToUse = branchToUse;
     }
 
-    printWorkerMessage(workerId, message) {
-        if (this.config.showWorkerNames) {
-            console.log(`W:${workerId} ${message}`);
-        } else {
-            console.log(message);
-        }
+    toWorkerIdPrefix(workerId) {
+        return this.config.showWorkerNames ? `W:${workerId}` : '';
     }
 
     printWorkerDivider() {
@@ -32,7 +30,7 @@ class ConsoleReporter {
         const type = isCodeMode ? 'File' : 'Test';
         const testIdLabel = test.isTestsContainer ? '' : `(${test.testId})`;
         const testUrlLabel = test.isTestsContainer ? '' : `url: ${chalk.underline(utils.getTestUrl(this.options.editorUrl, this.options.project, test.testId, test.resultId, this.branchToUse))}`;
-        this.printWorkerMessage(workerId, `${type} "${test.name}" started ${testIdLabel} ${testUrlLabel}`.trim());
+        console.log(this.toWorkerIdPrefix(workerId), `${type} "${test.name}" started ${testIdLabel} ${testUrlLabel}`.trim());
     }
 
     onTestFinished(test, workerId, isRerun, isCodeMode) {
@@ -42,7 +40,9 @@ class ConsoleReporter {
         }
         const testStatus = test.success ? constants.runnerTestStatus.PASSED : constants.runnerTestStatus.FAILED;
         const testIdLabel = test.isTestsContainer ? ' ' : `(${test.testId})`;
-        this.printWorkerMessage(workerId, `Test "${test.name}" finished status: ${testStatus} ${testIdLabel} duration: ${utils.getDuration(test.duration)}`);
+        const color = colorize[test.success ? 'success' : 'error'];
+
+        console.log(color(this.toWorkerIdPrefix(workerId), `Test "${test.name}" finished status: ${testStatus} ${testIdLabel} duration: ${utils.getDuration(test.duration)}`));
     }
 
     printAllFailedTests(failedTests) {
@@ -54,8 +54,8 @@ class ConsoleReporter {
                 }
                 return `${failedTest.name} : ${testUrl}`;
             });
-            console.log('Failed runs are:');
-            console.log(failedTestStrings.join('\n\r'));
+            console.log(colorize.error('Failed runs are:'));
+            console.log(colorize.error(failedTestStrings.join('\n\r')));
         }
     }
 
@@ -79,15 +79,20 @@ class ConsoleReporter {
         }
 
         const planName = this.buildTestPlanName(isAnonymous, testPlanName, isCodeMode);
+
+        let message;
+        const color = colorize[failed ? 'error' : 'success'];
+
         if (isCodeMode || planName.trim() === '' || planName.trim() === 'Anonymous') {
-            this.printWorkerDivider();
-            console.log(`Tests completed. PASSED: ${passed} FAILED: ${failed}${failedEvaluatingString} ABORTED: ${aborted}${skippedString} Duration: ${utils.getDuration(duration)} (Execution ID: ${executionId})`);
-            this.printWorkerDivider();
+            message = `Tests completed. PASSED: ${passed} FAILED: ${failed}${failedEvaluatingString} ABORTED: ${aborted}${skippedString} Duration: ${utils.getDuration(duration)} (Execution ID: ${executionId})`;
         } else {
-            this.printWorkerDivider();
-            console.log(`Test plan${planName} completed PASSED: ${passed} FAILED: ${failed}${failedEvaluatingString} ABORTED: ${aborted}${skippedString} Duration: ${utils.getDuration(duration)} (${executionId})`);
-            this.printWorkerDivider();
+            message = `Test plan${planName} completed PASSED: ${passed} FAILED: ${failed}${failedEvaluatingString} ABORTED: ${aborted}${skippedString} Duration: ${utils.getDuration(duration)} (${executionId})`;
         }
+
+        this.printWorkerDivider();
+        console.log(color(message));
+        this.printWorkerDivider();
+
         this.printAllFailedTests(failedTests);
     }
 
@@ -138,24 +143,24 @@ class ConsoleReporter {
     onGetSlot(workerId, browser) {
         const gridNameOrId = this.options.grid || this.options.gridId;
         if (gridNameOrId) {
-            this.printWorkerMessage(workerId, `Get ${chalk.underline(browser)} slot from ${chalk.underline(gridNameOrId)}`);
+            console.log(this.toWorkerIdPrefix(workerId), `Get ${chalk.underline(browser)} slot from ${chalk.underline(gridNameOrId)}`);
         }
     }
 
     onGetSession(workerId, testName, mode) {
-        this.printWorkerMessage(workerId, `Get browser to run ${chalk.underline(testName)}`);
+        console.log(this.toWorkerIdPrefix(workerId), `Get browser to run ${chalk.underline(testName)}`);
     }
 
     onWaitToTestStart(workerId) {
-        this.printWorkerMessage(workerId, 'Wait for test start');
+        console.log(this.toWorkerIdPrefix(workerId), 'Wait for test start');
     }
 
     onWaitToTestComplete(workerId, isCodeMode, debuggerAddress) {
         const type = isCodeMode ? 'file' : 'test';
-        this.printWorkerMessage(workerId, `Wait for ${type} complete`);
+        console.log(this.toWorkerIdPrefix(workerId), `Wait for ${type} complete`);
         if (debuggerAddress && isCodeMode) {
             // TODO(Benji) decide with Amitai what we want to do with this
-            this.printWorkerMessage(workerId, `Chrome Debugger available at ${debuggerAddress}`);
+            console.log(this.toWorkerIdPrefix(workerId), `Chrome Debugger available at ${debuggerAddress}`);
         }
     }
 
@@ -166,11 +171,11 @@ class ConsoleReporter {
         // heuristic, show the message on the same attempt
         const gridNameOrId = this.options.grid || this.options.gridId;
         if (gridNameOrId) { // if the user passes a grid or a gridId - show those
-            this.printWorkerMessage(workerId, `It is taking us some time to get a browser from the grid ${gridNameOrId}`);
+            console.log(colorize.warn(this.toWorkerIdPrefix(workerId), `It is taking us some time to get a browser from the grid ${gridNameOrId}`));
         } else if (this.options.usingLocalChromeDriver) {
-            this.printWorkerMessage(workerId, 'We are having issues starting ChromeDriver for you locally');
+            console.log(colorize.warn(this.toWorkerIdPrefix(workerId), 'We are having issues starting ChromeDriver for you locally'));
         } else if (this.options.host) {
-            this.printWorkerMessage(workerId, `We are having issues reaching your Selenium grid at ${this.options.host}:${this.options.port || 4444}`);
+            console.log(colorize.warn(this.toWorkerIdPrefix(workerId), `We are having issues reaching your Selenium grid at ${this.options.host}:${this.options.port || 4444}`));
         } else {
             // in other cases - print nothing
         }

package/runners/TestPlanRunner.js

@@ -69,7 +69,13 @@ class TestPlanRunner {
             .log('right after runTestPlanTests')
             .then(() => runAfterTests(afterTests, testStatus, executionId, tpOptions, branchToUse, authData))
             .then(() => executionResults)
-            .catch(StopRunOnError, () => catchBeforeTestsFailed(executionId));
+            .catch(err => {
+                logger.error('error running test plan', { err });
+                if (err instanceof StopRunOnError) {
+                    return catchBeforeTestsFailed(executionId);
+                }
+                throw err;
+            });
     }
 
     async initRealDataService(projectId) {

package/testRunHandler.js

@@ -321,10 +321,17 @@ TestRun.prototype.validateRunConfig = function () {
     const baseUrl = this.getBaseUrl();
     const { browserValue } = this.getRunConfig();
 
-    if (baseUrl) {
-        const { username, password } = new URL(baseUrl);
+    if (baseUrl && browserValue === 'safari') {
+        let parsedUrl;
+        try {
+            parsedUrl = new URL(baseUrl);
+        } catch (err) {
+            // ignore invalid URLs (missing http:// or https:// prefix)
+            return;
+        }
+        const { username, password } = parsedUrl;
 
-        if (browserValue === 'safari' && (username || password)) {
+        if (username || password) {
             throw new Error('Basic authentication in URL is not supported in Safari');
         }
     }