@testim/testim-cli 3.245.0 → 3.246.0

package/player/chromeLauncherTestPlayer.js

@@ -23,8 +23,8 @@ class LauncherDriver {
         this.chrome.process.once('exit', () => { this._isAlive = false; });
         this.chrome.process.once('close', () => { this._isAlive = false; });
         this._isAlive = true;
-        const browserEndpoint = await httpRequest.get(`http://localhost:${this.chrome.port}/json/version`);
-        await this.cdpTestRunner.initSession(browserEndpoint.webSocketDebuggerUrl);
+        const webSocketDebuggerUrl = await utils.getCdpAddressForHost(`localhost:${this.chrome.port}`);
+        await this.cdpTestRunner.initSession(webSocketDebuggerUrl);
 
         registerExitHook(() => this.chrome.kill());
     }

package/player/services/playbackTimeoutCalculator.js

@@ -4,6 +4,7 @@ const _ = require('lodash');
 
 const COMMUNICATION_BUFFER_TIME = 1000;
 const UI_VERIFICATION_STEPS = ['simple-ui-verification', 'wait-for-simple-ui-verification'];
+const FULL_TIMEOUT_STEP_TYPES = [...UI_VERIFICATION_STEPS, 'custom-validation', 'sfdc-step-login'];
 
 class PlaybackTimeoutCalculator {
     constructor(isDebuggerConnected) {
@@ -41,7 +42,7 @@ class PlaybackTimeoutCalculator {
         };
         stepPlayback.setStartTimestamp();
         const totalStepTime = this.getTotalStepRunTime(stepPlayback);
-        const currentRetryTimes = [...UI_VERIFICATION_STEPS, 'custom-validation'].includes(stepPlayback.stepType) ? [totalStepTime] : getRetryTimeoutSuggestions(totalStepTime);
+        const currentRetryTimes = FULL_TIMEOUT_STEP_TYPES.includes(stepPlayback.stepType) ? [totalStepTime] : getRetryTimeoutSuggestions(totalStepTime);
         this.resetStepVariables(totalStepTime, currentRetryTimes);
         stepPlayback.context.data.maxTotalStepTime = totalStepTime;
     }
@@ -61,6 +62,9 @@ class PlaybackTimeoutCalculator {
         if (UI_VERIFICATION_STEPS.includes(stepPlayback.stepType)) {
             fallbackTimeout = stepPlayback.context.config.applitoolsStepTimeout || HALF_HOUR_IN_MS;
         }
+        if (stepPlayback.step.type.startsWith('sfdc-')) {
+            fallbackTimeout = stepPlayback.step.defaultTimeout;
+        }
         return (stepPlayback.step.useStepTimeout && stepPlayback.step.stepTimeout) ? stepPlayback.step.stepTimeout : fallbackTimeout;
     }
     getTotalStepTimeLeftToPlay(stepPlayback, totalStepTime = this.totalStepTime) {

package/player/stepActions/sfdcStepAction.js

@@ -0,0 +1,27 @@
+const StepAction = require('./stepAction');
+const { sfdc } = require('../../commons/getSessionPlayerRequire');
+
+class SfdcStepAction extends StepAction {
+    async performAction() {
+        const page = sfdc.sfdcNewSePage(this.driver);
+        try {
+            const actions = this.context.sfdcTestActions;
+            if (actions === undefined) {
+                throw new Error('No test actions were compiled');
+            }
+            await sfdc.sfdcExecute(page, actions);
+            return { success: true };
+        } catch (err) {
+            return {
+                success: false,
+                reason: err.reason || err.message,
+                exception: err,
+                shouldRetry: false, // TODO - check this.  Our (bFormat) steps are probably not retryable?
+            };
+        } finally {
+            page.releaseObjects();
+        }
+    }
+}
+
+module.exports = SfdcStepAction;

package/player/stepActions/stepActionRegistrar.js

@@ -27,6 +27,7 @@ const CliJsStepAction = require('./cliJsStepAction');
 const CliConditionStepAction = require('./cliConditionStepAction');
 const NodePackageStepAction = require('./nodePackageStepAction');
 const ExtensionOnlyStepAction = require('./extensionOnlyStepAction');
+const SfdcStepAction = require('./sfdcStepAction');
 
 function register(stepActionByType, stepActionFactory) {
     Object.keys(stepActionByType).forEach(type => {
@@ -82,6 +83,17 @@ module.exports = function (driver, stepActionFactory, runMode) {
         'email-code-step': JsCodeStepAction,
         'cli-email-code-step': CliJsStepAction,
         'tdk-hybrid': TdkHybridStepAction,
+
+        'sfdc-step-login': SfdcStepAction,
+        'sfdc-step-logout': SfdcStepAction,
+        'sfdc-step-sobjectcreate': SfdcStepAction,
+        'sfdc-step-sobjectdelete': SfdcStepAction,
+        'sfdc-step-findrecord': SfdcStepAction,
+        'sfdc-step-quickaction': SfdcStepAction,
+        'sfdc-step-edit': SfdcStepAction,
+        'sfdc-step-sobjectvalidate': SfdcStepAction,
+        'sfdc-step-launchapp': SfdcStepAction,
+        'sfdc-step-closeconsoletabs': SfdcStepAction,
     };
 
     register(STEP_ACTION_MAPPING, stepActionFactory);

package/player/webdriver.js

@@ -1,6 +1,7 @@
-"use strict";
+/* eslint-disable no-var */
+'use strict';
 
-const logger = require('../commons/logger').getLogger("webdriver");
+const logger = require('../commons/logger').getLogger('webdriver');
 const Promise = require('bluebird');
 const parser = require('ua-parser-js');
 const desiredCapabilitiesBuilder = require('../commons/testimDesiredCapabilitiesBuilder');
@@ -14,8 +15,7 @@ const featureFlags = require('../commons/featureFlags');
 const _ = require('lodash');
 
 const [LEFT, RIGHT] = [0, 2];
-const { extractElementId } = utils;
-const httpRequest = require('../commons/httpRequest');
+const { extractElementId, getCdpAddressForHost } = utils;
 const perf = require('../commons/performance-logger');
 const { SeleniumPerfStats, SELENIUM_PERF_MARKS } = require('../commons/SeleniumPerfStats');
 
@@ -34,15 +34,11 @@ const playerUtils = () => {
 
 async function getCdpAddress(initResult) {
     try {
-        const debuggerAddress = initResult && initResult.value && initResult.value['goog:chromeOptions'] && initResult.value['goog:chromeOptions'].debuggerAddress;
-        if (!debuggerAddress) {
+        const debuggerHost = initResult && initResult.value && initResult.value['goog:chromeOptions'] && initResult.value['goog:chromeOptions'].debuggerAddress;
+        if (!debuggerHost) {
             return undefined;
         }
-        const browserEndpoint = await httpRequest.get('http://' + debuggerAddress + '/json/version');
-        if (!browserEndpoint) {
-            return undefined;
-        }
-        return browserEndpoint.webSocketDebuggerUrl;
+        return await getCdpAddressForHost(debuggerHost);
     } catch (e) {
         logger.info('Error getting cdpAddress', e);
         return undefined;
@@ -202,7 +198,10 @@ class WebDriver extends WebDriverApi {
 
     switchToLocatedFrame(locatedElement) {
         return this.getElement(locatedElement)
-            .tap(el => this.switchToFrame(el.value));
+            .then(async el => {
+                await this.switchToFrame(el.value);
+                return el;
+            });
     }
 
     switchToFrame(el) {
@@ -220,7 +219,7 @@ class WebDriver extends WebDriverApi {
 
     getElement(locatedElement) {
         const perfId = this.seleniumPerfStats.markStart(SELENIUM_PERF_MARKS.GET_ELEMENT);
-        if (typeof locatedElement === "string" || typeof locatedElement === "number") { // support testimId in the meanwhile for backwards compatability
+        if (typeof locatedElement === 'string' || typeof locatedElement === 'number') { // support testimId in the meanwhile for backwards compatability
             return this.getElementBySelector(`[testim_dom_element_id='${locatedElement}']`)
                 .finally(() => this.seleniumPerfStats.markEnd(perfId, SELENIUM_PERF_MARKS.GET_ELEMENT));
         }
@@ -353,13 +352,13 @@ class WebDriver extends WebDriverApi {
 
             function isTextElement(element) {
                 var tagName = element.tagName;
-                return (tagName === "INPUT" || tagName === "TEXTAREA");
+                return (tagName === 'INPUT' || tagName === 'TEXTAREA');
             }
 
             function getFixedTextContent(element) {
                 try { // fix for salesforce's custom-elements
                     if (element.shadowRoot && Object.getOwnPropertyDescriptor(element.ownerDocument.defaultView.Node.prototype,'textContent').get.toString().indexOf('[native code]') === -1) {
-                        return element.shadowRoot.textContent.replace(/(\r\n|\n|\r)/gm, "");
+                        return element.shadowRoot.textContent.replace(/(\r\n|\n|\r)/gm, '');
                     }
                 } catch (err) { }
                 if (ignoreHiddenTagsText && Array.prototype.some.call(element.children, function (elem) { return elem.hidden; })) {
@@ -386,7 +385,7 @@ class WebDriver extends WebDriverApi {
                         var svgContent = new XMLSerializer().serializeToString(element);
                         copyElement = new DOMParser().parseFromString(svgContent, 'text/html').body.firstChild;
                     }
-                    return clearTitleTags(copyElement).textContent.replace(/(\r\n|\n|\r)/gm, "");
+                    return clearTitleTags(copyElement).textContent.replace(/(\r\n|\n|\r)/gm, '');
                 } else {
                     return getFixedTextContent(element);
                 }
@@ -429,7 +428,7 @@ class WebDriver extends WebDriverApi {
             })
             .catch(err => !(err instanceof IeError), err => {
                 this.seleniumPerfStats.markEnd(perfId, SELENIUM_PERF_MARKS.GET_HTML);
-                const testimInternalError = Object.assign(new Error(), { success: false, reason: err.toString(), errorType: "internal-error" });
+                const testimInternalError = Object.assign(new Error(), { success: false, reason: err.toString(), errorType: 'internal-error' });
                 if (!this.client.requestHandler.sessionID) {
                     // we got here after the driver has been disposed of. It's impossible to run JavaScirpt on the page.
                     testimInternalError.extraInfo = 'Inside getHtml catch and trying to check if in quirks mode - but the session has already terminated';
@@ -438,10 +437,10 @@ class WebDriver extends WebDriverApi {
                 if (!this.isIE()) { // no need to check quirks mode if I'm not in IE
                     throw testimInternalError;
                 }
-                return this.executeJS(`return navigator.userAgent;`)
+                return this.executeJS('return navigator.userAgent;')
                     .catch(() => Promise.reject(testimInternalError))
                     .then(ua => {
-                        const error = this.isUsingUnsupportedCompabilityMode(ua.value) ? this.getIeError("Can’t run test in IE compatibility mode") : testimInternalError;
+                        const error = this.isUsingUnsupportedCompabilityMode(ua.value) ? this.getIeError('Can’t run test in IE compatibility mode') : testimInternalError;
                         return Promise.reject(error);
                     });
             });
@@ -527,7 +526,7 @@ class WebDriver extends WebDriverApi {
         try {
             return parseInt(parse.browser.major);
         } catch (err) {
-            logger.error("failed to get browser version", { err: err });
+            logger.error('failed to get browser version', { err: err });
             return 0;
         }
     }
@@ -536,13 +535,13 @@ class WebDriver extends WebDriverApi {
         function getBrowserName(ua, browserDetails) {
             var M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
             if (/trident/i.test(M[1])) {
-                return "Internet Explorer " + browserDetails.major;
+                return 'Internet Explorer ' + browserDetails.major;
             }
             if (M[1] === 'Chrome' && ua.match(/\bOPR\/(\d+)/) !== null) {
-                return "opera";
+                return 'opera';
             }
             if (M[1] === 'Chrome' && ua.match(/\bEdge|Edg\/(\d+)/) !== null) {
-                return "edge";
+                return 'edge';
             }
             M = M[2] ? [M[1], M[2]] : [ua.appName, ua.appVersion, '-?'];
             var tem = ua.match(/version\/(\d+)/i);
@@ -558,7 +557,7 @@ class WebDriver extends WebDriverApi {
 
         return this.executeJS(function () {
             if (typeof window === 'undefined' || !window.navigator || !window.navigator.userAgent) {
-                return "unknown";
+                return 'unknown';
             }
             return window.navigator.userAgent;
         }).then(userAgent => {
@@ -566,7 +565,7 @@ class WebDriver extends WebDriverApi {
             const parse = parser(rawUserAgent);
             const osDetails = parse.os;
             this.browserAndOS = {
-                os: osDetails.name + " " + osDetails.version,
+                os: osDetails.name + ' ' + osDetails.version,
                 browserMajor: this.getBrowserMajorVersion(parse),
                 browser: getBrowserName(userAgent.value, parse.browser),
                 userAgent: rawUserAgent,
@@ -595,7 +594,7 @@ class WebDriver extends WebDriverApi {
             !playerUtils().isWithinBounds(-inViewCenter.y, inViewCenter.y, top)) {
             // [NOTE] the code is not supposed to get here! - using center (0,0) instead of step offsets.
             // this is a fallback so the action will take place even if for some reason calculation went out of element..
-            logger.warn("using center as fallback for offset");
+            logger.warn('using center as fallback for offset');
             return this.getMoveActions(0, 0, element);
         }
         return this.getMoveActions(left, top, element);
@@ -612,20 +611,20 @@ class WebDriver extends WebDriverApi {
         const moveActions = this.getRelativeMoveActions(offsets, element);
         const clickActions = this.getClickActions(actions, button);
         return this.actions([{
-            type: "pointer",
-            id: "mouse",
+            type: 'pointer',
+            id: 'mouse',
             parameters: { pointerType: 'mouse' },
-            actions: moveActions.concat(clickActions)
+            actions: moveActions.concat(clickActions),
         }]).catch(err => {
             logger.error('tried to use element origin but failed because of visibility, trying absolute', err);
             const { x, y } = this.computeAbsoluteMovement(offsets);
             const moveActions = this.getMoveActions(x, y);
             return this.actions([{
-                type: "pointer",
-                id: "mouse",
+                type: 'pointer',
+                id: 'mouse',
                 parameters: { pointerType: 'mouse' },
-                actions: moveActions.concat(clickActions)
-            }])
+                actions: moveActions.concat(clickActions),
+            }]);
         });
     }
 
@@ -639,7 +638,7 @@ class WebDriver extends WebDriverApi {
             var getLocatedElement = ${codeSnippets().getLocatedElementCode};
             var dispatchFocus = ${dispatchFocus.toString()};
             var doubleClick = ${doubleClick.toString()};
-            var eventData = ${this.isEdge() ? `JSON.parse(arguments[0])` : `arguments[0]`};
+            var eventData = ${this.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
             var done = arguments[1];
             return doubleClick.call(null, eventData, done);
         `, eventData.timeout, eventParam);
@@ -651,8 +650,8 @@ class WebDriver extends WebDriverApi {
 
     getClickActionList(types = [], button) {
         return [{
-            type: "pointer",
-            id: "mouse",
+            type: 'pointer',
+            id: 'mouse',
             actions: this.getClickActions(types, button)
         }];
     }
@@ -740,26 +739,26 @@ class WebDriver extends WebDriverApi {
 
     getMoveActions(x = 1, y = 1, origin = 'viewport', duration = 0) {
         // force x != 0 ,y != 0 because of Safari issues
-        return [{ type: "pointerMove", duration, x: Math.floor(x) || 1, y: Math.floor(y) || 1, origin }];
+        return [{ type: 'pointerMove', duration, x: Math.floor(x) || 1, y: Math.floor(y) || 1, origin }];
     }
 
     moveWithActionsAPI(point) {
         const actions = this.getMoveActions(point.x, point.y);
         return this.actions([{
-            type: "pointer",
-            id: "mouse",
+            type: 'pointer',
+            id: 'mouse',
             actions: actions
         }]);
     }
 
     moveToElementWithActionsAPI(seleniumElement, offsets) {
         return this.actions([{
-            type: "pointer",
-            id: "mouse",
-            actions: this.getRelativeMoveActions(offsets, seleniumElement)
+            type: 'pointer',
+            id: 'mouse',
+            actions: this.getRelativeMoveActions(offsets, seleniumElement),
         }]).catch(err => {
             logger.error('tried to use element origin but failed because of visibility, trying location', err);
-            const point = this.computeAbsoluteMovement(offsets)
+            const point = this.computeAbsoluteMovement(offsets);
             return this.moveWithActionsAPI(point);
         });
     }
@@ -789,14 +788,14 @@ class WebDriver extends WebDriverApi {
         const doDrag = this.getMoveActions(xDiff, yDiff, 'pointer', 1);
         const endDrag = this.getClickActions(['pointerUp'], LEFT);
         return this.actions([{
-            type: "pointer",
-            id: "mouse",
+            type: 'pointer',
+            id: 'mouse',
             actions: goToDrag.concat(startDrag).concat(doDrag).concat(endDrag)
-        }])
+        }]);
     }
 
     drag(seleniumElement, targetRect, xElementOffset, yElementOffset, events) {
-        const { width, height } = targetRect
+        const { width, height } = targetRect;
         const midXRelative = this.isEdge() ? xElementOffset : (xElementOffset - width / 2 + 1);
         const midYRelative = this.isEdge() ? yElementOffset : (yElementOffset - height / 2);
         return this.getDragCoordinates(events)
@@ -870,8 +869,8 @@ class WebDriver extends WebDriverApi {
         const actions = startMovePositionActions.concat(pointerDownActions).concat(moveSequenceActions).concat(endMovePositionActions).concat(pointerUpActions);
 
         return this.actions([{
-            type: "pointer",
-            id: "mouse",
+            type: 'pointer',
+            id: 'mouse',
             actions: actions
         }]);
     }
@@ -957,7 +956,7 @@ class WebDriver extends WebDriverApi {
 
     getElementRect(target) {
         let defaultLocation = { width: 0, height: 0, top: 0, left: 0 };
-        return this.getElementLocation(target).catch((err) => logger.error("error getting element location", { err }))
+        return this.getElementLocation(target).catch((err) => logger.error('error getting element location', { err }))
             .then(loc => {
                 if (loc && loc.value) {
                     return {
@@ -972,9 +971,9 @@ class WebDriver extends WebDriverApi {
     }
 
     end() {
-        logger.info("delete session", { sessionId: this.getSessionId() });
+        logger.info('delete session', { sessionId: this.getSessionId() });
         if (!this.getSessionId()) {
-            logger.warn("failed to close session because session is undefined");
+            logger.warn('failed to close session because session is undefined');
         }
         clearInterval(this.keepAliveTimer);
         return super.end()

package/runOptions.js

@@ -474,7 +474,7 @@ module.exports = {
             const originalRequire = Module.prototype.require;
             Module.prototype.require = function requireThatOverridesSessionPlayer(id) {
                 if (id.endsWith('getSessionPlayerRequire')) {
-                    const sessionPlayerPath = path.resolve(fullPlayerPath, 'src/background/sessionPlayerInit.js');
+                    const sessionPlayerPath = path.resolve(fullPlayerPath, 'src/background/sessionPlayerInit.ts');
                     return originalRequire.call(this, sessionPlayerPath);
                 }
                 if (id === 'rox-alias') {
@@ -1230,6 +1230,8 @@ module.exports = {
                 suiteNames: program.intersectWithSuite.length ? [program.intersectWithSuite].flat() : undefined,
                 suiteIds: program.intersectWithSuiteId.length ? [program.intersectWithSuiteId].flat() : undefined,
             },
+
+            downloadBrowser: program.downloadBrowser,
         });
     },
 };

package/runner.js

@@ -2,7 +2,6 @@
 
 /* eslint-disable no-console */
 const { CLI_MODE } = require('./commons/constants');
-const Promise = require('bluebird');
 const _ = require('lodash');
 const { EDITOR_URL } = require('./commons/config');
 const tunnel = require('./commons/testimTunnel');
@@ -29,7 +28,7 @@ const featureAvailabilityService = require('./commons/featureAvailabilityService
 const logger = require('./commons/logger').getLogger('runner');
 
 function validateCLIRunsAreAllowed(options) {
-    const hasCliAccess = _(options).get('company.activePlan.premiumFeatures.allowCLI');
+    const hasCliAccess = _.get(options, 'company.activePlan.premiumFeatures.allowCLI');
 
     if (!hasCliAccess) {
         const projectId = options.project;
@@ -38,20 +37,18 @@ function validateCLIRunsAreAllowed(options) {
     }
 }
 
-function validateProjectQuotaNotDepleted(options) {
+async function validateProjectQuotaNotDepleted(options) {
     const projectId = options.project;
 
-    return servicesApi.getUsageForCurrentBillingPeriod(projectId)
-        .then(usage => {
-            const isExecutionBlocked = usage && usage.isExecutionBlocked;
-            if (!isExecutionBlocked) {
-                return;
-            }
-
-            console.error('You have reached the limit of runs for the billing month, please upgrade your plan at https://www.testim.io/upgrade-contact-us?source=cli');
-            analytics.track(options.authData.uid, 'execution-quota-surpassed', { projectId });
-            throw new QuotaDepletedError();
-        });
+    const usage = await servicesApi.getUsageForCurrentBillingPeriod(projectId);
+    const isExecutionBlocked = usage && usage.isExecutionBlocked;
+    if (!isExecutionBlocked) {
+        return;
+    }
+
+    console.error('You have reached the limit of runs for the billing month, please upgrade your plan at https://www.testim.io/upgrade-contact-us?source=cli');
+    analytics.track(options.authData.uid, 'execution-quota-surpassed', { projectId });
+    throw new QuotaDepletedError();
 }
 
 function validateOptionsForCompany(options, company) {
@@ -60,26 +57,27 @@ function validateOptionsForCompany(options, company) {
         return;
     }
 
-    const companyRetention = _(company).get('activePlan.premiumFeatures.resultRetention');
+    const companyRetention = _.get(company, 'activePlan.premiumFeatures.resultRetention');
     if (optionsRetention > companyRetention) {
         throw new ArgError(`Retention days (${optionsRetention}) cannot be greater than the company's retention days (${companyRetention}). Run aborted`);
     }
 }
 
-function validateCliAccount(options) {
+async function validateCliAccount(options) {
     if (options.lightweightMode && options.lightweightMode.disableQuotaBlocking) {
-        return Promise.resolve();
+        return;
     }
-    return Promise.all([
-        validateProjectQuotaNotDepleted(options),
-        validateCLIRunsAreAllowed(options),
-    ]).catch(err => {
+    try {
+        await Promise.all([
+            validateProjectQuotaNotDepleted(options),
+            validateCLIRunsAreAllowed(options),
+        ]);
+    } catch (err) {
         if (err instanceof ArgError || err instanceof QuotaDepletedError) {
-            return Promise.reject(err);
+            throw err;
         }
         logger.error('could not validate cli account', { err });
-        return undefined;
-    });
+    }
 }
 
 function analyticsIdentify(projectId) {
@@ -125,10 +123,10 @@ function setCompany(options, company) {
     if (onprem) {
         const { mode, extensionPath, ext, playerPath } = options;
         if ([CLI_MODE.SELENIUM].includes(mode) && !playerPath) {
-            return Promise.reject(new ArgError('in selenium on prem mode --player-path must be provided'));
+            throw new ArgError('in selenium on prem mode --player-path must be provided');
         }
         if (mode === 'extension' && !extensionPath && !ext) {
-            return Promise.reject(new ArgError('In extension on prem mode --ext or --extension-path must be provided'));
+            throw new ArgError('In extension on prem mode --ext or --extension-path must be provided');
         }
     }
     const isPOC = Boolean(activePlan.isPoc);
@@ -153,16 +151,14 @@ function setCompany(options, company) {
         isStartUp,
         activePlan,
     };
-    return undefined;
 }
 
 function setSystemInfo(options, editorConfig) {
     if (EDITOR_URL) {
         options.editorUrl = EDITOR_URL;
-        return Promise.resolve();
+        return;
     }
     options.editorUrl = editorConfig.editorUrl;
-    return undefined;
 }
 
 function setAllGrids(options, allGrids) {
@@ -198,7 +194,7 @@ async function setMockNetworkRules(options) {
     }
 }
 
-function runRunner(options, customExtensionLocalLocation) {
+async function runRunner(options, customExtensionLocalLocation) {
     perf.log('in runner.js runRunner');
 
     const { project, remoteRunId, useLocalChromeDriver, useChromeLauncher } = options;
@@ -210,15 +206,21 @@ function runRunner(options, customExtensionLocalLocation) {
     npmDriver.checkNpmVersion();
     perf.log('in runner.js after checkNpmVersion');
 
-    return validateCliAccount(options)
-        .log('in runRunner before tunnel.connect')
-        .then(() => tunnel.connect(options))
-        .log('in runRunner after tunnel.connect')
-        .then(() => new TestPlanRunner(customExtensionLocalLocation).run(options))
-        .log('before tunnel.disconnect')
-        .tap(() => tunnel.disconnect(options))
-        .tap(() => gridService.keepAlive.end(project))
-        .log('after tunnel.disconnect and gridService.keepAlive.end');
+    await validateCliAccount(options);
+
+    perf.log('in runRunner before tunnel.connect');
+    await tunnel.connect(options);
+    perf.log('in runRunner after tunnel.connect');
+
+    const testPlanRunner = new TestPlanRunner(customExtensionLocalLocation);
+    const results = await testPlanRunner.run(options);
+
+    perf.log('before tunnel.disconnect');
+    await tunnel.disconnect(options);
+    await gridService.keepAlive.end(project);
+    perf.log('after tunnel.disconnect and gridService.keepAlive.end');
+
+    return results;
 }
 
 function showFreeGridRunWarningIfNeeded(options) {
@@ -237,7 +239,7 @@ function showFreeGridRunWarningIfNeeded(options) {
  * - Reporting the user to analytics
  * - Authenticating the user and exchanging their token for a jwt
  * - Sets the grids for the company and validates the user has permission to run the CLI
- * @param {Object} options - the run options rpassed to the CLI, namely the project and token
+ * @param {Object} options - the run options passed to the CLI, namely the project and token
  */
 async function init(options) {
     perf.log('start runner init');
@@ -273,6 +275,7 @@ async function init(options) {
     }
 
     if (options.lightweightMode && options.lightweightMode.type === 'turboMode') {
+        // eslint-disable-next-line max-len
         console.log('\nTurbo mode will ignore step delays. Test artifacts like screenshots and logs will only be saved for failed runs. For more information see our docs: https://help.testim.io/docs/turbo-mode');
     }
 
@@ -288,5 +291,5 @@ async function init(options) {
 
 module.exports = {
     run: runRunner,
-    init: Promise.method(init),
+    init,
 };

package/testRunHandler.js

@@ -520,7 +520,10 @@ class TestRun {
                 waitForTestEnd();
             }
         })
-            .tap(() => this.onCompletedCleanup())
+            .then(async res => {
+                await this.onCompletedCleanup();
+                return res;
+            })
             .finally(() => onConnected && !this._options.disableSockets && testResultService.off('socket-connected', onConnected));
     }