@testim/testim-cli 3.243.0 → 3.246.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.243.0",
+  "version": "3.246.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{
@@ -57,7 +57,6 @@
     "appium-dom-utils": "1.0.6",
     "archiver": "5.3.0",
     "bluebird": "3.7.2",
-    "bluebird-retry": "0.11.0",
     "body-parser": "1.19.1",
     "chalk": "4.1.2",
     "chrome-launcher": "0.15.0",
@@ -87,6 +86,7 @@
     "npm": "8.3.0",
     "object-hash": "3.0.0",
     "ora": "5.4.1",
+    "p-retry": "4.6.2",
     "pako": "1.0.11",
     "portfinder": "1.0.28",
     "promise-queue": "2.2.5",

package/player/WebDriverHttpRequest.js

@@ -4,8 +4,8 @@ const _ = require('lodash');
 const httpRequest = require('../commons/httpRequest');
 const utils = require('../utils');
 const SeleniumProtocolError = require('./SeleniumProtocolError');
-const {SELENIUM_STATUS_CODES} = require('./constants');
-const logger = require('./../commons/logger').getLogger("WebDriverHttpRequest");
+const { SELENIUM_STATUS_CODES } = require('./constants');
+const logger = require('../commons/logger').getLogger('WebDriverHttpRequest');
 
 function isSuccessfulResponse(body, statusCode) {
     /**
@@ -56,37 +56,37 @@ class WebDriverHttpRequest {
     }
 
     handleFailedStatus(requestId, response, err = {}) {
-        const {body, statusCode, headers, text} = response;
+        const { body, statusCode, headers, text } = response;
         const resBody = _.isEmpty(body) && text ? text : body;
         /**
          * in Appium you find sometimes more exact error messages in origValue
          */
         if (resBody && resBody.value && typeof resBody.value.origValue === 'string' && typeof resBody.value.message === 'string') {
-            resBody.value.message += ' ' + resBody.value.origValue;
+            resBody.value.message += ` ${resBody.value.origValue}`;
         }
 
         if (resBody && typeof resBody === 'string') {
-            throw new SeleniumProtocolError(resBody, {requestId});
+            throw new SeleniumProtocolError(resBody, { requestId });
         }
 
         if (resBody && resBody.value) {
             const errorCode = SELENIUM_STATUS_CODES[resBody.status] || (resBody.value && SELENIUM_STATUS_CODES[resBody.value.error]) || SELENIUM_STATUS_CODES[-1];
-            let error = {
+            const error = {
                 type: errorCode ? errorCode.id : 'unknown',
                 message: errorCode ? errorCode.message : 'unknown',
-                orgStatusMessage: resBody.value ? resBody.value.message : ''
+                orgStatusMessage: resBody.value ? resBody.value.message : '',
             };
 
-            throw new SeleniumProtocolError(error, {requestId});
+            throw new SeleniumProtocolError(error, { requestId });
         }
 
         // IEServer webdriver bug where the error is put into the Allow header
         // https://github.com/SeleniumHQ/selenium/issues/6828
         if (statusCode === 405) {
             const allowHeader = headers && headers.allow;
-            const err = new SeleniumProtocolError(allowHeader, {requestId});
-            if (err.message.match(/Command not found/)) {
-                throw err;
+            const _err = new SeleniumProtocolError(allowHeader, { requestId });
+            if (_err.message.match(/Command not found/)) {
+                throw _err;
             }
         }
 
@@ -94,12 +94,12 @@ class WebDriverHttpRequest {
             status: -1,
             type: err.code || 'ECONNREFUSED',
             orgStatusMessage: err.rawResponse || err.message,
-            message: err.rawResponse || "Couldn't connect to selenium server"
-        }, {requestId});
+            message: err.rawResponse || "Couldn't connect to selenium server",
+        }, { requestId });
     }
 
     processHttpOnSuccess(response, requestId) {
-        const {body, statusCode} = response;
+        const { body, statusCode } = response;
         if (isSuccessfulResponse(body, statusCode)) {
             return body;
         }
@@ -108,44 +108,49 @@ class WebDriverHttpRequest {
     }
 
     processHttpOnError(err, requestId) {
-        const response = err && err.response || {};
+        const response = (err && err.response) || {};
         return this.handleFailedStatus(requestId, response, err);
     }
 
     httpPostRequest(path, body = {}) {
         const requestId = utils.guid();
-        if (path === "/session") {
-            logger.info("POST REQUEST", {requestId, path, testResultId: this.testResultId});
+        if (path === '/session') {
+            logger.info('POST REQUEST', { requestId, path, testResultId: this.testResultId });
         } else {
-            logger.info("POST REQUEST", {requestId, path, body, testResultId: this.testResultId});
+            logger.info('POST REQUEST', { requestId, path, body, testResultId: this.testResultId });
         }
 
         return httpRequest.postFullRes(`${this.gridUrl}${path}`, body, this.headers, this.connectionRetryTimeout)
-            .tap((response) => logger.info("POST RESPONSE", {
-                requestId,
-                path,
-                res: JSON.stringify(response.body),
-                testResultId: this.testResultId
-            }))
+            .then(response => {
+                logger.info('POST RESPONSE', {
+                    requestId,
+                    path,
+                    res: JSON.stringify(response.body),
+                    testResultId: this.testResultId,
+                });
+                return response;
+            })
             .catch(err => this.processHttpOnError(err, requestId))
             .then((response) => this.processHttpOnSuccess(response, requestId));
     }
 
     httpGetRequest(path) {
         const requestId = utils.guid();
-        logger.info("GET REQUEST", {requestId, path, testResultId: this.testResultId});
+        logger.info('GET REQUEST', { requestId, path, testResultId: this.testResultId });
         const query = {};
         return httpRequest.getFullRes(`${this.gridUrl}${path}`, query, this.headers, this.connectionRetryTimeout)
-            .tap((response) => {
-                if (_.endsWith(path, "/screenshot")) {
-                    return logger.info("GET RESPONSE", {requestId, path, testResultId: this.testResultId});
+            .then(response => {
+                if (_.endsWith(path, '/screenshot')) {
+                    logger.info('GET RESPONSE', { requestId, path, testResultId: this.testResultId });
+                    return response;
                 }
-                logger.info("GET RESPONSE", {
+                logger.info('GET RESPONSE', {
                     requestId,
                     path,
                     res: JSON.stringify(response.body),
-                    testResultId: this.testResultId
+                    testResultId: this.testResultId,
                 });
+                return response;
             })
             .catch(err => this.processHttpOnError(err, requestId))
             .then((response) => this.processHttpOnSuccess(response, requestId));
@@ -153,14 +158,17 @@ class WebDriverHttpRequest {
 
     httpDeleteRequest(path) {
         const requestId = utils.guid();
-        logger.info("DELETE REQUEST", {requestId, path, testResultId: this.testResultId});
+        logger.info('DELETE REQUEST', { requestId, path, testResultId: this.testResultId });
         return httpRequest.deleteFullRes(`${this.gridUrl}${path}`, undefined, this.headers, this.connectionRetryTimeout)
-            .tap((response) => logger.info("DELETE RESPONSE", {
-                requestId,
-                path,
-                res: JSON.stringify(response.body),
-                testResultId: this.testResultId
-            }))
+            .then(response => {
+                logger.info('DELETE RESPONSE', {
+                    requestId,
+                    path,
+                    res: JSON.stringify(response.body),
+                    testResultId: this.testResultId,
+                });
+                return response;
+            })
             .catch(err => this.processHttpOnError(err, requestId))
             .then((response) => this.processHttpOnSuccess(response, requestId));
     }

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/RefreshStepAction.js

@@ -6,10 +6,8 @@ require('bluebird');
 class RefreshStepAction extends StepAction {
     execute() {
         return this.driver.reloadTab()
-            .return({ success: true })
-            .catch(error => {
-                return { success: false, reason: error.message };
-            });
+            .then(() => ({ success: true }))
+            .catch(error => ({ success: false, reason: error.message }));
     }
 }
 

package/player/stepActions/inputFileStepAction.js

@@ -86,18 +86,22 @@ class InputFileStepAction extends StepAction {
         const target = this.context.data[this.step.targetId || 'targetId'];
         const overrideAzureStorageUrl = featureFlagService.flags.overrideAzureStorageUrl.isEnabled();
         const useJsInputCodeInSafari = featureFlagService.flags.useJsInputCodeInSafari.isEnabled();
+        const useJsInputCodeInFirefox = featureFlagService.flags.useJsInputCodeInFirefox.isEnabled();
         const downloadToBase64 = featureFlagService.flags.downloadToBase64.isEnabled();
 
         let fileUrls = await utils.addTokenToFileUrl(this.context.project.id, this.step.fileUrls, this.stepActionUtils.testimServicesApi, overrideAzureStorageUrl, logger);
 
+
+        const isSafariJsInputCode = this.driver.isSafari() && (useJsInputCodeInSafari || fileUrls.length > 1);
+        const isFirefoxJsInputCode = this.driver.isFirefox() && (useJsInputCodeInFirefox || fileUrls.length > 1);
+
         if (downloadToBase64) {
             fileUrls = await Promise.all(fileUrls.map(async ({ name, url }) => {
                 const res = await download(url);
                 return { name, url: `data:${res.type};base64,${Buffer.from(res.body).toString('base64')}` };
             }));
         }
-
-        if (this.driver.isSafari() && (useJsInputCodeInSafari || fileUrls.length > 1)) {
+        if (isSafariJsInputCode || isFirefoxJsInputCode) {
             await this.driver.executeJSWithArray(`
                 const getLocatedElement = ${codeSnippets.getLocatedElementCode};
                 const downloadAndUploadFile = ${downloadAndUpload()};

package/player/stepActions/scripts/doClick.js

@@ -1,4 +1,6 @@
-"use strict";
+/* globals getLocatedElement, dispatchFocus */
+
+'use strict';
 
 var doClick = function (eventData, done) {
     var eventConstructorSupported = typeof Event === 'function';

package/player/stepActions/scripts/html5dragAction.js

@@ -1,4 +1,6 @@
-"use strict";
+/* global getLocatedElement */
+
+'use strict';
 
 var html5dndAction = function(eventData) {
     var data = {};

package/player/stepActions/scripts/html5dragActionV2.js

@@ -1,4 +1,6 @@
-"use strict";
+/* global getLocatedElement */
+
+'use strict';
 
 var html5dndAction = function (eventData, done) {
     var mouseEventConstructorSupported = typeof MouseEvent === 'function';

package/player/stepActions/scripts/runCode.js

@@ -3,23 +3,40 @@
 'use strict';
 
 const runCode = function (eventData, preCompiledCode) {
+    typeof Object.tstassign !== 'function' && (Object.tstassign = function (n, t) {
+        'use strict';
 
-    "function"!=typeof Object.tstassign&&(Object.tstassign=function(n,t){"use strict";if(null==n)throw new TypeError("Cannot convert undefined or null to object");for(var r=Object(n),e=1;e<arguments.length;e++){var o=arguments[e];if(null!=o)for(var a in o)Object.prototype.hasOwnProperty.call(o,a)&&(r[a]=o[a])}return r});
-    Object.assign = typeof Object.assign !== "function" ? Object.tstassign : Object.assign;
+        if (n == null) throw new TypeError('Cannot convert undefined or null to object'); for (var r = Object(n), e = 1; e < arguments.length; e++) { var o = arguments[e]; if (o != null) for (var a in o)Object.prototype.hasOwnProperty.call(o, a) && (r[a] = o[a]); } return r;
+    });
+    Object.assign = typeof Object.assign !== 'function' ? Object.tstassign : Object.assign;
 
     function appendToStorage(name, data) {
         const sessionItem = 'data-testim-' + name;
+
+        const nativeFuncErrMsg = 'Native sessionStorage is not available';
+        function isNativeFunction(fn) {
+            if (!fn || !fn.toString) {
+                return false;
+            }
+            return fn.toString().indexOf('[native code]') > -1;
+        }
         try {
+            if (![window.sessionStorage.setItem, window.sessionStorage.getItem].every(isNativeFunction)) {
+                throw new Error(nativeFuncErrMsg);
+            }
             const oldData = JSON.parse(window.sessionStorage.getItem(sessionItem) || '{}');
             const newData = Object.tstassign({}, oldData, data);
             window.sessionStorage.setItem(sessionItem, JSON.stringify(newData));
         } catch (err) {
-            // any vernation QuotaExceededError from browsers
+            // any variation QuotaExceededError from browsers
             const isQuotaExceededError = err.message.toLowerCase().indexOf('quota') > -1;
+            const isNativeFunctionError = err.message === nativeFuncErrMsg;
+
             if (err.message.indexOf('sessionStorage') > -1 || // Chrome + Firefox
                 err.message.indexOf('The operation is insecure') > -1 || // Safari
                 err.message.indexOf('SecurityError') > -1 || // Edge
-                isQuotaExceededError
+                isQuotaExceededError ||
+                isNativeFunctionError
             ) {
                 var storage = document.head.querySelector('#testim-storage-backup');
                 if (!storage) {
@@ -30,13 +47,13 @@ const runCode = function (eventData, preCompiledCode) {
                 const oldData = JSON.parse(storage.getAttribute(sessionItem) || '{}');
                 const newData = Object.tstassign({}, oldData, data);
                 storage.setAttribute(sessionItem, JSON.stringify(newData));
-                if (isQuotaExceededError) {
+                if (isQuotaExceededError || isNativeFunctionError) {
                     try {
                         window.sessionStorage.removeItem(sessionItem);
                     } catch (e) {
                         // Prevents future retries from looking in sessionStorage with old data
                     }
-                    window.TSTA.useFallbackStorage = true;
+                    (window.TSTA = window.TSTA || {}).useFallbackStorage = true;
                 }
                 return;
             }

package/player/stepActions/scripts/scroll.js

@@ -1,9 +1,4 @@
-// Disabling the eslint to keep this in a format which works on IE 11.
-/* eslint-disable no-var */
-/* eslint-disable no-redeclare */
-/* eslint-disable object-shorthand */
-/* eslint-disable one-var */
-/* eslint-disable operator-linebreak */
+/* globals getLocatedElement, elementScrollTo */
 
 'use strict';
 

package/player/stepActions/scripts/setText.js

@@ -1,4 +1,7 @@
-"use strict";
+/* globals getLocatedElement, dispatchFocus */
+
+'use strict';
+
 /*global KeyboardEvent */
 var setText = function (eventData, done) {
     var eventConstructorSupported = typeof Event === 'function';

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/utils/screenshotUtils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Promise = require('bluebird');
-const utils = require('../../utils');
+const pRetry = require('p-retry');
 
 class ScreenshotUtils {
     constructor(tabId, driver, options = { takeScreenshots: true }) {
@@ -29,7 +29,7 @@ class ScreenshotUtils {
         const SCREENSHOT_RETRY_DELAY = 2000;
         const devicePixelRatioPromise = this.currentDevicePixelRatio ? Promise.resolve(this.currentDevicePixelRatio) : this.getDevicePixelRatio();
         const getScreenshot = () => Promise.all([devicePixelRatioPromise, this.driver.takeScreenshot()]);
-        return utils.runWithRetries(getScreenshot, MAX_RETRY_COUNT, SCREENSHOT_RETRY_DELAY)
+        return pRetry(getScreenshot, { retries: MAX_RETRY_COUNT, minTimeout: SCREENSHOT_RETRY_DELAY })
             .then(([devicePixelRatio, image]) => {
                 const base64 = image ? image.value : '';
                 const dataUrl = `data:image/png;base64,${this.base64AddPadding(base64.replace(/[\r\n]/g, ''))}`;

package/player/utils/windowUtils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Promise = require('bluebird');
-const utils = require('../../utils');
+const pRetry = require('p-retry');
 const { PageNotAvailableError } = require('../../errors');
 const logger = require('../../commons/logger').getLogger('window-utils');
 
@@ -152,12 +152,12 @@ WindowUtils.prototype.quit = function () {
 };
 
 WindowUtils.prototype.getOsAndBrowser = function () {
-    return utils.runWithRetries(() => this.driver.getBrowserAndOS())
+    return pRetry(() => this.driver.getBrowserAndOS(), { retries: 3 })
         .then(osAndBrowser => ({ uaBrowserName: osAndBrowser.browser, uaOs: osAndBrowser.os, userAgent: osAndBrowser.userAgent, browserVersion: osAndBrowser.browserVersion }));
 };
 
 WindowUtils.prototype.getUserAgentInfo = function () {
-    return utils.runWithRetries(() => this.driver.getUserAgentInfo());
+    return pRetry(() => this.driver.getUserAgentInfo(), { retries: 3 });
 };
 
 module.exports = WindowUtils;