@testim/testim-cli 3.225.0 → 3.226.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.225.0",
+  "version": "3.226.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@testim/testim-cli",
-      "version": "3.225.0",
+      "version": "3.226.0",
       "license": "Proprietary",
       "dependencies": {
         "@applitools/eyes-sdk-core": "13.0.0",
@@ -651,9 +651,9 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
-      "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+      "version": "7.17.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
+      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.16.7",
@@ -662,8 +662,8 @@
         "@babel/helper-split-export-declaration": "^7.16.7",
         "@babel/helper-validator-identifier": "^7.16.7",
         "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1812,6 +1812,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/mime-db": {
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/accepts/node_modules/mime-types": {
       "version": "2.1.34",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
@@ -1874,9 +1882,9 @@
       }
     },
     "node_modules/agentkeepalive": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz",
-      "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
       "dependencies": {
         "debug": "^4.1.0",
         "depd": "^1.1.2",
@@ -4831,9 +4839,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.71",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
-      "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==",
+      "version": "1.4.73",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz",
+      "integrity": "sha512-RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -8615,9 +8623,9 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -16135,9 +16143,9 @@
       }
     },
     "node_modules/vm2": {
-      "version": "3.9.8",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz",
-      "integrity": "sha512-/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==",
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz",
+      "integrity": "sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==",
       "dependencies": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -17163,9 +17171,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
-      "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+      "version": "7.17.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
+      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.16.7",
@@ -17174,8 +17182,8 @@
         "@babel/helper-split-export-declaration": "^7.16.7",
         "@babel/helper-validator-identifier": "^7.16.7",
         "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/helper-simple-access": {
@@ -18099,6 +18107,11 @@
         "negotiator": "0.6.3"
       },
       "dependencies": {
+        "mime-db": {
+          "version": "1.51.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+          "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+        },
         "mime-types": {
           "version": "2.1.34",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
@@ -18144,9 +18157,9 @@
       }
     },
     "agentkeepalive": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz",
-      "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
       "requires": {
         "debug": "^4.1.0",
         "depd": "^1.1.2",
@@ -20550,9 +20563,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.71",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
-      "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==",
+      "version": "1.4.73",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz",
+      "integrity": "sha512-RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA==",
       "dev": true
     },
     "emoji-regex": {
@@ -23580,9 +23593,9 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
       "version": "2.1.27",
@@ -29284,9 +29297,9 @@
       }
     },
     "vm2": {
-      "version": "3.9.8",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz",
-      "integrity": "sha512-/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==",
+      "version": "3.9.9",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz",
+      "integrity": "sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==",
       "requires": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"

package/package.json

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

package/testRunStatus.js

@@ -63,7 +63,7 @@ const RunStatus = function (testInfoList, options, testPlanId, branchToUse) {
         testPlanId,
         testPlans: options.testPlan,
         testLabels: options.label,
-        testSuites: _.uniq(_.flatten(testInfoList.map(test => test.testSuites))),
+        testSuites: _.uniq(testInfoList.flatMap(test => test.testSuites)),
         testNames: options.name,
         testIds: options.testId,
         testConfigs: options.testConfigNames,
@@ -173,10 +173,12 @@ RunStatus.prototype.testStartReport = function (test, executionId, testRetryKey)
         return Promise.resolve();
     }
     return runHook(this.options.beforeTest, Object.assign({}, test, { exportsGlobal: this.exportsGlobal }), this.options.userData.loginData.token)
-        .then(params => {
+        .then(async params => {
             this.options.runParams[test.resultId] = test.config.testData = Object.assign({}, test.config.testData, this.exportsGlobal, this.fileUserParamsData, this.beforeSuiteParams, params);
             test.startTime = Date.now();
-            return this.updateTestStatusRunning(test, executionId, testRetryKey);
+            await this.updateTestStatusRunning(test, executionId, testRetryKey);
+
+            return test;
         }).catch(err => {
             logger.error('Failed to start test', { err });
             throw err;

package/workers/BaseWorker.js

@@ -141,8 +141,7 @@ class BaseWorker {
                 const player = this.initPlayer(testRunHandler);
                 try {
                     gridInfo = await gridService.handleHybridOrVendorIfNeeded(
-                        this.options, gridInfo, this.testRunConfig, this.lambdatestService,
-                        { maxRetries: getBrowserRetriesNumber, currentRetry: failedGetBrowserAttempts + 1 },
+                        this.options, gridInfo, this.testRunConfig, this.lambdatestService, { maxRetries: getBrowserRetriesNumber, currentRetry: failedGetBrowserAttempts + 1 },
                     );
                     this.options.gridData.provider = gridInfo.provider;
                     this.options.gridData.host = gridInfo.host;
@@ -192,9 +191,10 @@ class BaseWorker {
         }
 
         perf.log('before runTest onTestStarted');
-        await this.onTestStarted(this.id, testRunHandler.getTestId(), testRunHandler.getTestResultId(), shouldRerun, testRunHandler.getRetryKey());
-        const testPlayer = await this.getTestPlayer(testRunHandler, customExtensionLocalLocation);
+        const test = await this.onTestStarted(this.id, testRunHandler.getTestId(), testRunHandler.getTestResultId(), shouldRerun, testRunHandler.getRetryKey());
+        testRunHandler._baseUrl = test.config.baseUrl;
 
+        const testPlayer = await this.getTestPlayer(testRunHandler, customExtensionLocalLocation);
         try {
             return await this.runTestOnce(testRunHandler, testPlayer);
         } finally {
@@ -276,13 +276,13 @@ class BaseWorker {
             }
 
             const msg = err instanceof Error ? err.message : err;
-            if (msg.indexOf(GET_BROWSER_TIMEOUT_MSG) > -1) {
+            if (msg.includes(GET_BROWSER_TIMEOUT_MSG)) {
                 return { errorType: SETUP_TIMEOUT, reason: "Test couldn't get browser" };
             }
-            if (msg.indexOf(TEST_START_TIMEOUT_MSG) > -1) {
+            if (msg.includes(TEST_START_TIMEOUT_MSG)) {
                 return { errorType: SETUP_TIMEOUT, reason: "Test couldn't be started" };
             }
-            if (msg.indexOf(TEST_COMPLETE_TIMEOUT_MSG) > -1) {
+            if (msg.includes(TEST_COMPLETE_TIMEOUT_MSG)) {
                 if (!this.testRunTimeout) {
                     return { errorType: SETUP_TIMEOUT, reason: 'Test timeout reached: test is too long' };
                 }

package/workers/BaseWorker.test.js

@@ -1,21 +1,32 @@
+const proxyquire = require('proxyquire');
+
 const { expect, sinon } = require('../../test/utils/testUtils');
-const BaseWorker = require('./BaseWorker');
 const gridService = require('../services/gridService');
 const reporter = require('../reports/reporter');
 const Bluebird = require('bluebird');
 const { PageNotAvailableError, GridError, GetBrowserError } = require('../errors');
 const servicesApi = require('../commons/testimServicesApi');
+const { releasePlayer } = require('./workerUtils');
+
 
 describe('BaseWorker', () => {
     let worker;
     let handleHybridStub;
     let getGridSlotStub;
-    const sandbox = sinon.createSandbox();
+    let runTestOnceStub = sinon.stub();
     let testRunHandlerMock;
     let testPlayerMock;
+    const onTestStartedStub = sinon.stub();
+    const sandbox = sinon.createSandbox();
 
     beforeEach(() => {
-        worker = new BaseWorker(null, {});
+        const BaseWorker = proxyquire.noCallThru()('./BaseWorker', {
+            './workerUtils': {
+                releasePlayer: () => sinon.stub().resolves({}),
+            },
+        });
+
+        worker = new BaseWorker(null, {}, null, null, onTestStartedStub);
         worker.userData = {};
         worker.options = { gridData: {}, browser: 'chrome', company: { companyId: 'companyId' }, getBrowserTimeout: 1000, getSessionTimeout: 100, getBrowserRetries: 10 };
         worker.testRunConfig = {};
@@ -25,6 +36,7 @@ describe('BaseWorker', () => {
 
         sinon.stub(worker, 'initPlayer').returns(testPlayerMock);
         sinon.stub(worker, 'getBrowserOnce').returns({});
+        runTestOnceStub = sinon.stub(worker, 'runTestOnce');
         handleHybridStub = sinon.stub(gridService, 'handleHybridOrVendorIfNeeded').callThrough();
         getGridSlotStub = sinon.stub(gridService, 'getGridSlot').resolves({});
 
@@ -154,5 +166,27 @@ describe('BaseWorker', () => {
                 expect(worker.getBrowserOnce.getCall(2).args[3]).to.shallowDeepEqual({ type: 'testimHybrid', gridId: 'gridId', provider: 'a', host: 'google.com', user: undefined, key: undefined, port: 4444 });
             });
         });
+
+        describe('runTest', () => {
+            it('should call the runTestOnc with the base url of the test object we acquired from onTestStarted', async () => {
+                const testRunHandler = {
+                    _baseUrl: 'https://testim.io',
+                    getTestStatus: () => sinon.stub().returns(42),
+                    getTestId: () => sinon.stub().returns(42),
+                    getTestResultId: () => sinon.stub().returns(42),
+                    getRetryKey: () => sinon.stub().returns(42),
+                    getExecutionId: () => sinon.stub().returns(42),
+                    testRunHandler: () => sinon.stub().returns(42),
+                    clearTestResult: () => sinon.stub().returns(42),
+                };
+                onTestStartedStub.returns({
+                    config: {
+                        baseUrl: 'http://demo.testim.io/',
+                    },
+                });
+                await worker.runTest(testRunHandler);
+                expect(runTestOnceStub.firstCall.firstArg._baseUrl).to.equals('http://demo.testim.io/');
+            });
+        });
     });
 });

package/workers/WorkerExtensionSingleBrowser.js

@@ -45,7 +45,8 @@ class WorkerExtensionSingleBrowser extends WorkerExtension {
         }
 
         perf.log('before runTest onTestStarted single browser');
-        await this.onTestStarted(this.id, testRunHandler.getTestId(), testRunHandler.getTestResultId(), shouldRerun, testRunHandler.getRetryKey());
+        const test = await this.onTestStarted(this.id, testRunHandler.getTestId(), testRunHandler.getTestResultId(), shouldRerun, testRunHandler.getRetryKey());
+        testRunHandler._baseUrl = test.config.baseUrl;
         const testPlayer = await this.getTestPlayer(testRunHandler, customExtensionLocalLocation);
 
         testRunHandler.markClearBrowser();