@testim/testim-cli 3.236.0 → 3.237.0

package/executionQueue.js

@@ -7,6 +7,10 @@ class ExecutionQueue {
         this._waitingTests = testList.map(testInfo => new TestRun(executionId, executionName, testInfo, options, branchToUse, testStatus));
     }
 
+    stop() {
+        this._waitingTests = [];
+    }
+
     getNext() {
         const nextTestRunHandler = this._waitingTests.shift();
         if (nextTestRunHandler) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.236.0",
+  "version": "3.237.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@testim/testim-cli",
-      "version": "3.236.0",
+      "version": "3.237.0",
       "license": "Proprietary",
       "dependencies": {
         "@applitools/eyes-sdk-core": "13.2.0",

package/package.json

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

package/player/webdriver.js

@@ -332,7 +332,7 @@ class WebDriver extends WebDriverApi {
     }
 
     getElementTextJS(locatedElement) {
-        function extractTextCode(locatedElement) {
+        function extractTextCode(locatedElement, ignoreHiddenTagsText) {
             // copy of utils.getElementTextContent to run inside content script
             // sadly .children doesn't work for SVG elements in IE11
             function clearTitleTags(node) {
@@ -362,14 +362,15 @@ class WebDriver extends WebDriverApi {
                         return element.shadowRoot.textContent.replace(/(\r\n|\n|\r)/gm, "");
                     }
                 } catch (err) { }
-                if (this.ignoreHiddenTagsText && Array.prototype.some.call(element.children, elem => elem.hidden)) {
-                    const dupElement = element.cloneNode(true);
-                    const hiddenChildren = Array.prototype.filter.call(dupElement.children, elem => elem.hidden);
-                    hiddenChildren.forEach(child => {
+                if (ignoreHiddenTagsText && Array.prototype.some.call(element.children, function (elem) { return elem.hidden; })) {
+                    var dupElement = element.cloneNode(true);
+                    var hiddenChildren = Array.prototype.filter.call(dupElement.children, function (elem) { return elem.hidden; });
+                    hiddenChildren.forEach(function (child) { 
                         dupElement.removeChild(child);
                     });
-                    return dupElement.textContent.replace(/(\r\n|\n|\r)/gm, "");
-                } return element.textContent.replace(/(\r\n|\n|\r)/gm, "");
+                    return dupElement.textContent.replace(/(\r\n|\n|\r)/gm, '');
+                }
+                return element.textContent.replace(/(\r\n|\n|\r)/gm, '');
             }
 
             function getElementTextContent(element) {
@@ -399,7 +400,7 @@ class WebDriver extends WebDriverApi {
             var getLocatedElement = ${codeSnippets().getLocatedElementCode};
             var extractText = ${extractTextCode.toString()};
             return extractText.apply(null, arguments)
-        `, locatedElement)
+        `, locatedElement, this.ignoreHiddenTagsText)
             .then(result => result.value);
     }
 

package/runOptions.js

@@ -187,6 +187,8 @@ program
     .option('--token [token]', 'identification token to testim')
     .option('--is-regression-baseline-run', 'save doms and run results as regression baseline data')
     .option('--parallel [number-of-tests]', 'number of tests to run on parallel')
+    .option('--before-parallel [number-of-tests]', 'number of tests to run on parallel in the before phase of a test plan')
+    .option('--after-parallel [number-of-tests]', 'number of tests to run on parallel in the after phase of a test plan')
     .option('--canary [canary-mode]', 'enable canary mode', false)
     .option('--test-plan [test-plan-name]', 'test plan to run', collect, [])
     .option('--test-plan-id [test-plan-id]', 'test plan to run', collect, [])
@@ -762,7 +764,9 @@ module.exports = {
 
         const timeoutWasGiven = Boolean(program.timeout);
         program.timeout = !program.timeout || typeof program.timeout === 'boolean' ? 10 * 60 * 1000 : Number(program.timeout);
+        program.beforeParallel = !program.beforeParallel || typeof program.beforeParallel === 'boolean' ? 1 : Number(program.beforeParallel);
         program.parallel = !program.parallel || typeof program.parallel === 'boolean' ? 1 : Number(program.parallel);
+        program.afterParallel = !program.afterParallel || typeof program.afterParallel === 'boolean' ? 1 : Number(program.afterParallel);
 
 
         if (program.parallel > 1 && program.run && !program.gridId && !program.grid &&
@@ -817,10 +821,18 @@ module.exports = {
             throw new ArgError('test run timeout could not be a negative number, --timeout <run-timeout>');
         }
 
+        if (program.beforeParallel <= 0 || _.isNaN(program.beforeParallel)) {
+            throw new ArgError('before-parallel could not be a negative number or not number, --before-parallel <number-of-tests>');
+        }
+
         if (program.parallel <= 0 || _.isNaN(program.parallel)) {
             throw new ArgError('parallel could not be a negative number or not number, --parallel <number-of-tests>');
         }
 
+        if (program.afterParallel <= 0 || _.isNaN(program.afterParallel)) {
+            throw new ArgError('after-parallel could not be a negative number or not number, --after-parallel <number-of-tests>');
+        }
+
         if (![CLI_MODE.EXTENSION, CLI_MODE.SELENIUM].includes(program.mode)) {
             throw new ArgError(`runner mode <${program.mode}> is not supported`);
         }
@@ -866,6 +878,10 @@ module.exports = {
             );
         }
 
+        if (!isTestPlanSpecified && (program.beforeParallel !== 1 || program.afterParallel !== 1)) {
+            throw new ArgError('cannot set --before-parallel or --after-parallel without --test-plan option');
+        }
+
         if (
             (program.testId.length ||
                 isTestPlanSpecified ||
@@ -1089,7 +1105,9 @@ module.exports = {
             mode: program.mode,
             isRegressionBaselineRun: program.isRegressionBaselineRun,
             browser: program.browser,
+            beforeParallel: program.beforeParallel,
             parallel: program.parallel,
+            afterParallel: program.afterParallel,
             canary: program.canary,
             rerunFailedByRunId: program.rerunFailedByRunId,
             disableGridCheck: program.disableGridCheck,

package/runners/ParallelWorkerManager.js

@@ -50,6 +50,8 @@ class ParallelWorkerManager {
             return undefined;
         }
 
+        let stoppedOnError = false;
+        let runningTests = 0;
         const runAndWaitToComplete = token => new Promise((resolve, reject) => {
             const projectId = options.project;
             const executionQueue = new ExecutionQueue(executionId, executionName, testList, options, branchToUse, testStatus);
@@ -68,6 +70,7 @@ class ParallelWorkerManager {
             const sessionType = utils.getSessionType(options);
 
             const onTestStarted = (wid, testId, resultId, isRerun, testRetryKey) => {
+                runningTests++;
                 analyticsService.analyticsTestStart({
                     authData,
                     executionId,
@@ -150,11 +153,12 @@ class ParallelWorkerManager {
                     isStartUp,
                 });
                 if (stopOnError && !testResult.success) {
-                    reject(new StopRunOnError());
-                    throw new StopRunOnError();
+                    executionQueue.stop();
+                    stoppedOnError = true;
                 }
+                runningTests--;
                 const completedTests = Object.keys(combinedTestResults).length;
-                if (completedTests === testCount) {
+                if (completedTests === testCount || (stopOnError && runningTests === 0)) {
                     resolve(combinedTestResults);
                     return undefined;
                 }
@@ -164,8 +168,9 @@ class ParallelWorkerManager {
             const onTestIgnored = (wid, testResult) => {
                 combinedTestResults[testResult.resultId] = testResult;
                 testStatus.onTestIgnored(wid, testResult.resultId);
+                runningTests--;
                 const completedTests = Object.keys(combinedTestResults).length;
-                if (completedTests === testCount) {
+                if (completedTests === testCount || (stopOnError && runningTests === 0)) {
                     resolve(combinedTestResults);
                 }
             };
@@ -195,7 +200,11 @@ class ParallelWorkerManager {
 
         try {
             const token = await testimCustomToken.getCustomTokenV3();
-            return await runAndWaitToComplete(token);
+            const result = await runAndWaitToComplete(token);
+            if (stoppedOnError) {
+                throw new StopRunOnError();
+            }
+            return result;
         } catch (err) {
             logger.error('failed running parallel workers', { executionId, err });
             throw err;

package/runners/TestPlanRunner.js

@@ -35,7 +35,7 @@ class TestPlanRunner {
         const authData = testimCustomToken.getTokenV3UserData();
 
         const runBeforeTests = () => {
-            const workerCount = 1;
+            const workerCount = tpOptions.beforeParallel || 1;
             const stopOnError = true;
             return this.workerManager.runTests(beforeTests, testStatus, executionId, executionName, tpOptions, branchToUse, authData, workerCount, stopOnError)
                 .then(beforeTestsResults => Object.assign(executionResults, beforeTestsResults));
@@ -51,7 +51,7 @@ class TestPlanRunner {
         };
 
         const runAfterTests = () => {
-            const workerCount = 1;
+            const workerCount = tpOptions.afterParallel || 1;
             const stopOnError = false;
             return this.workerManager.runTests(afterTests, testStatus, executionId, executionName, tpOptions, branchToUse, authData, workerCount, stopOnError)
                 .then(afterTestsResults => Object.assign(executionResults, afterTestsResults));