@testim/testim-cli 3.253.0 → 3.255.0

package/workers/BaseWorker.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const Bluebird = require('bluebird');
 const moment = require('moment');
 const pRetry = require('p-retry');
 const ms = require('ms');
@@ -128,8 +127,7 @@ class BaseWorker {
             let gridInfo = await pRetry(async () => {
                 const startTime = Date.now();
                 try {
-                    return await Bluebird.resolve(this.getSlotOnce(testRunHandler))
-                        .timeout(this.options.getBrowserTimeout, timeoutMessages.GET_BROWSER_TIMEOUT_MSG);
+                    return await utils.promiseTimeout(this.getSlotOnce(testRunHandler), this.options.getBrowserTimeout, timeoutMessages.GET_BROWSER_TIMEOUT_MSG);
                 } catch (error) {
                     logger.error('error getting grid slot', { error, testId: this.testId, testResultId: this.testResultId, executionId: this.executionId });
                     failedGetSlotAttempts++;
@@ -156,11 +154,13 @@ class BaseWorker {
                     this.options.gridData.host = gridInfo.host;
                     this.options.gridData.failedGetBrowserAttempts = failedGetBrowserAttempts;
                     const getSessionTimeout = this.setSessionTimeout();
-                    const getBrowserRes = await Bluebird.resolve()
-                        .log('before getBrowserOnce')
-                        .then(() => this.getBrowserOnce(testRunHandler, customExtensionLocalLocation, player, gridInfo))
-                        .log('after getBrowserOnce')
-                        .timeout(getSessionTimeout, timeoutMessages.GET_BROWSER_TIMEOUT_MSG);
+                    perf.log('before getBrowserOnce');
+                    const getBrowserRes = await utils.promiseTimeout(
+                        this.getBrowserOnce(testRunHandler, customExtensionLocalLocation, player, gridInfo),
+                        getSessionTimeout,
+                        timeoutMessages.GET_BROWSER_TIMEOUT_MSG,
+                    );
+                    perf.log('after getBrowserOnce');
                     reporter.onGetBrowserSuccess(this.id, projectId);
                     return player || getBrowserRes;
                 } catch (error) {
@@ -243,7 +243,7 @@ class BaseWorker {
                 const testRetryKey = testRunHandler.getRetryKey();
                 testResult.testRetryKey = testRetryKey;
                 await this.onTestCompleted(this.id, this.testId, testResult, sessionId, shouldRerun);
-                if (this.executionQueue.hasMoreTests() && !(this.options.lightweightMode && this.options.lightweightMode.general)) {
+                if (this.executionQueue.hasMoreTests() && !this.options.lightweightMode?.general) {
                     await utils.delay(DELAY_BETWEEN_TESTS);
                 }
                 await this.runTestCleanup();
@@ -264,11 +264,11 @@ class BaseWorker {
                     return await runTestAndCalcResult(testRunHandler, shouldRerun);
                 }
                 return await runNextTest();
-            } catch (err) {
-                if (err instanceof StopRunOnError) {
+            } catch (error) {
+                if (error instanceof StopRunOnError) {
                     return undefined;
                 }
-                logger.error('failed to process test result', { err });
+                logger.error('failed to process test result', { error });
                 runNextTest();
                 return undefined;
             }
@@ -342,7 +342,7 @@ class BaseWorker {
             }
             logger.warn('error on run', { err });
 
-            const projectId = this.userData && this.userData.projectId;
+            const projectId = this.userData?.projectId;
             const { errorType, reason } = buildError(err, wasNetworkHealthy);
             testimServicesApi.updateTestResult(projectId, this.testResultId, this.testId, {
                 status: testRunStatus.COMPLETED,
@@ -358,7 +358,7 @@ class BaseWorker {
         const recoverTestResults = async (runError, testRunHandler) => {
             const testId = this.testId;
             const resultId = this.testResultId;
-            const projectId = this.userData && this.userData.projectId;
+            const projectId = this.userData?.projectId;
             const branch = this.branch;
             if (!testId || !resultId || !projectId || !branch) {
                 // Not enough data to call the API
@@ -409,6 +409,7 @@ class BaseWorker {
             });
 
         const testRunHandler = this.executionQueue.getNext();
+
         if (!testRunHandler) { // no more tests to run
             return this.onQueueCompleted();
         }
@@ -418,6 +419,7 @@ class BaseWorker {
         this.overrideTestConfigId = testRunHandler.getOverrideTestConfigId();
         this.testRunConfig = testRunHandler.getRunConfig();
         this.branch = testRunHandler.getBranch();
+
         return runTestAndCalcResult(testRunHandler);
     }
 }

package/workers/WorkerAppium.js

@@ -113,7 +113,7 @@ class WorkerAppium extends BaseWorker {
         }
         try {
             await super.runTestOnce(testRunHandler, appiumTestPlayer);
-            await runAppiumTest.call(this);
+            return await runAppiumTest.call(this);
         } catch (err) {
             logger.error('failed to run test once', { err });
             throw err;

package/workers/WorkerExtension.js

@@ -10,7 +10,6 @@ const ExtensionTestPlayer = require('../player/extensionTestPlayer');
 const ChromeLauncherTestPlayer = require('../player/chromeLauncherTestPlayer');
 const reporter = require('../reports/reporter');
 
-const TEST_START_TIMEOUT_MS = parseInt(process.env.TESTIM_TEST_START_TIMEOUT, 10) || (2 * 60 * 1000);
 
 class WorkerExtension extends BaseWorker {
     initPlayer() {
@@ -65,7 +64,7 @@ class WorkerExtension extends BaseWorker {
             if (this.options.useChromeLauncher) {
                 const testTimeout = this.options.timeoutWasGiven ?
                     Math.max(10000, this.options.timeout) :
-                    TEST_START_TIMEOUT_MS;
+                    this.options.testStartTimeout;
 
                 reporter.onWaitToTestStart(this.id);
                 reporter.onWaitToTestComplete(this.id, this.isCodeMode);
@@ -82,20 +81,20 @@ class WorkerExtension extends BaseWorker {
                     });
             }
 
-            const startStausDetails = { driverUrlFinished: false, testRunHandlerStartedFinished: false }; //for logging / debugging purposes
+            const startStatusDetails = { driverUrlFinished: false, testRunHandlerOnStartedHadFinished: false }; //for logging / debugging purposes
             return new Promise((resolve, reject) => testRunHandler.getRunTestUrl()
                 .then(url => {
                     reporter.onWaitToTestStart(this.id);
                     return Promise.all([
-                        driver.url(url).tap(() => { startStausDetails.driverUrlFinished = true; }).catch(err => {
+                        driver.url(url).tap(() => { startStatusDetails.driverUrlFinished = true; }).catch(err => {
                             logger.error('error from driver.url', { err, testResultId, executionId, testId, url, urlLength: url.length });
                             throw err;
                         }),
-                        testRunHandler.onStarted(TEST_START_TIMEOUT_MS).tap(() => { startStausDetails.testRunHandlerStartedFinished = true; }),
+                        testRunHandler.onStarted(this.options.testStartTimeout).tap(() => { startStatusDetails.testRunHandlerOnStartedHadFinished = true; }),
                     ])
-                        .timeout(TEST_START_TIMEOUT_MS, timeoutMessages.TEST_START_TIMEOUT_MSG)
+                        .timeout(this.options.testStartTimeout, timeoutMessages.TEST_START_TIMEOUT_MSG)
                         .catch(Promise.TimeoutError, () => {
-                            logger.warn('timeout occurred (see log\'s payload). Running checkViaRestAPIIfTestStarted', { testResultId, executionId, testId, ...startStausDetails });
+                            logger.warn('timeout occurred (see log\'s payload). Running checkViaRestAPIIfTestStarted', { testResultId, executionId, testId, ...startStatusDetails });
                             return testRunHandler.checkViaRestAPIIfTestStarted();
                         });
                 })

package/workers/WorkerExtensionSingleBrowser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Bluebird = require('bluebird');
+const { delay } = require('../utils');
 const { releasePlayer } = require('./workerUtils');
 const WorkerExtension = require('./WorkerExtension');
 const perf = require('../commons/performance-logger');
@@ -14,7 +14,7 @@ class WorkerExtensionSingleBrowser extends WorkerExtension {
         if (!this.testPlayer) {
             return;
         }
-        await releasePlayer(this.id, this.releaseSlotOnTestFinished, this.userData && this.userData.projectId, this.testPlayer);
+        await releasePlayer(this.id, this.releaseSlotOnTestFinished, this.userData?.projectId, this.testPlayer);
         this.testPlayer = null;
     }
 
@@ -58,8 +58,8 @@ class WorkerExtensionSingleBrowser extends WorkerExtension {
             await this.onQueueCompleted();
             return;
         }
-        if (this.options.lightweightMode && this.options.lightweightMode.general) {
-            await Bluebird.delay(DELAY_BETWEEN_TESTS);
+        if (this.options.lightweightMode?.general) {
+            await delay(DELAY_BETWEEN_TESTS);
         }
     }
 }

package/workers/WorkerSelenium.js

@@ -92,12 +92,15 @@ class WorkerSelenium extends BaseWorker {
         sessionPlayer.playbackManager.executionName = testRunHandler.getExecutionName();
 
         sessionPlayer.setLightweightMode(this.options.lightweightMode);
+        if (testRunHandler.getSfdcCredential()) {
+            sessionPlayer.setSfdcCredential(testRunHandler.getSfdcCredential());
+        }
         if (sessionPlayerInit.localAssetService) {
             sessionPlayerInit.localAssetService.initialize({ serverUrl: this.options.localRCASaver });
         }
 
         let preloadedTest = null;
-        if (this.options.lightweightMode && this.options.lightweightMode.preloadTests) {
+        if (this.options.lightweightMode?.preloadTests) {
             const preloadedTests = await preloadTests(this.options);
             preloadedTest = preloadedTests[this.testId];
         }
@@ -208,7 +211,7 @@ class WorkerSelenium extends BaseWorker {
 function setupCliPerformanceMonitoring(sessionPlayer) {
     const { playback } = sessionPlayerInit.commonConstants;
     function monitorEvent(event) {
-        sessionPlayer.playbackManager.on(event, (...args) => {
+        sessionPlayer.playbackManager.on(event, () => {
             perf.log(`Got event ${event}`);
         });
     }

package/utils.test.js

@@ -1,68 +0,0 @@
-const chai = require('chai');
-const utils = require('./utils');
-
-const expect = chai.expect;
-
-describe('utils', () => {
-    describe('calcPercentile', () => {
-        it('should calc some precentiles', () => {
-            // Arrange:
-            const arr = [4, 5, 1, 2, 7, 8, 3, 6, 9, 10];
-
-            // Act:
-            const p0 = utils.calcPercentile(arr, 0);
-            const p50 = utils.calcPercentile(arr, 50);
-            const p90 = utils.calcPercentile(arr, 90);
-            const p95 = utils.calcPercentile(arr, 95);
-            const p100 = utils.calcPercentile(arr, 100);
-
-            // Assert:
-            expect(p0).to.eql(1);
-            expect(p50).to.eql(5);
-            expect(p90).to.eql(9);
-            expect(p95).to.eql(10);
-            expect(p100).to.eql(10);
-        });
-    });
-    describe('getTestUrl', () => {
-        it('should create properly escaped test URL', () => {
-            expect(utils.getTestUrl('http://localhost:8080', 'project', 'test')).to.equal('http://localhost:8080/#/project/project/branch/master/test/test');
-            expect(utils.getTestUrl('http://localhost:8080', 'project', 'test', 'result')).to.equal('http://localhost:8080/#/project/project/branch/master/test/test?result-id=result');
-            expect(utils.getTestUrl('http://localhost:8080', 'project', 'test', 'result', null)).to.equal('http://localhost:8080/#/project/project/branch/master/test/test?result-id=result');
-            expect(utils.getTestUrl('http://localhost:8080', 'project', 'test', 'result', 'normal-branch-name'))
-                .to.equal('http://localhost:8080/#/project/project/branch/normal-branch-name/test/test?result-id=result');
-            expect(utils.getTestUrl('http://localhost:8080', 'project', 'test', 'result', 'branch/with/slashes'))
-                .to.equal('http://localhost:8080/#/project/project/branch/branch%2Fwith%2Fslashes/test/test?result-id=result');
-            expect(utils.getTestUrl('http://localhost:8080', 'project', 'test', 'result', 'branch with spaces'))
-                .to.equal('http://localhost:8080/#/project/project/branch/branch%20with%20spaces/test/test?result-id=result');
-            expect(utils.getTestUrl('http://localhost:8080', 'project', 'test', 'result', 'encoded%20branch'))
-                .to.equal('http://localhost:8080/#/project/project/branch/encoded%2520branch/test/test?result-id=result');
-        });
-    });
-
-    describe('getArgsOnRemoteRunFailure', () => {
-        let originalArgv;
-
-        beforeEach(() => {
-            originalArgv = process.argv;
-        });
-
-        afterEach(() => {
-            process.argv = originalArgv;
-        });
-
-        it('should return undefined if no remote run is current', () => {
-            process.argv = ['node', 'file.js', '--token', 'token', '--project', 'project-id'];
-            expect(utils.getArgsOnRemoteRunFailure()).to.be.undefined;
-        });
-
-        it('should return details if remote run is current', () => {
-            process.argv = ['node', 'file.js', '--token', 'token', '--project', 'project-id', '--remoteRunId', 'remote-run-id'];
-            expect(utils.getArgsOnRemoteRunFailure()).to.eql({
-                remoteRunId: 'remote-run-id',
-                projectId: 'project-id',
-                token: 'token',
-            });
-        });
-    });
-});