@testim/testim-cli 3.225.0 → 3.228.0

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();