@testim/testim-cli 3.230.0 → 3.233.0

package/package.json

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

package/player/WebDriverHttpRequest.js

@@ -154,7 +154,7 @@ class WebDriverHttpRequest {
     httpDeleteRequest(path) {
         const requestId = utils.guid();
         logger.info("DELETE REQUEST", {requestId, path, testResultId: this.testResultId});
-        return httpRequest.deleteFullRes(`${this.gridUrl}${path}`, this.headers, this.connectionRetryTimeout)
+        return httpRequest.deleteFullRes(`${this.gridUrl}${path}`, undefined, this.headers, this.connectionRetryTimeout)
             .tap((response) => logger.info("DELETE RESPONSE", {
                 requestId,
                 path,

package/player/stepActions/scripts/scroll.js

@@ -1,5 +1,5 @@
 "use strict";
-var scroll = function (elementToScrollOn, elementToScrollTo, isScrollToElement, expectedX, expectedY, shouldScrollLeft, shouldScrollTop) {
+var scroll = function (elementToScrollOn, elementToScrollTo, isScrollToElement, isDynamicScroll, expectedX, expectedY, shouldScrollLeft, shouldScrollTop) {
 
     function doScroll(expectedPosition, element) {
         if (!element) {
@@ -21,6 +21,11 @@ var scroll = function (elementToScrollOn, elementToScrollTo, isScrollToElement,
         }
 
         var target = getLocatedElement(locatedElement);
+
+        if (isDynamicScroll && !target) {
+            return { x: parentElement.scrollWidth, y: parentElement.scrollHeight };
+        }
+
         if(!target) {
             throw new Error('could not find target element');
         }
@@ -63,8 +68,13 @@ var scroll = function (elementToScrollOn, elementToScrollTo, isScrollToElement,
 
     var actualXString = result.actualX;
     var actualYString = result.actualY;
+    var actualScrollToElement = getLocatedElement(elementToScrollTo);
+
+    if (isScrollToElement && isDynamicScroll && !actualScrollToElement) {
+        return { success: false, expectedPosition };
+    }
+
     if (isScrollToElement) {
-        var actualScrollToElement = getLocatedElement(elementToScrollTo);
         if (!actualScrollToElement) {
             throw new Error('could not find target to scroll to');
         }

package/player/stepActions/scrollStepAction.js

@@ -38,7 +38,7 @@ class ScrollStepAction extends StepAction {
             return scroll.apply(null, arguments)
         `;
 
-        return this.driver.executeJSWithArray(scrollCode, [elementToScrollOn, elementToScrollTo, !!step.isScrollToElement, expectedX, expectedY, step.shouldScrollLeft, step.shouldScrollTop])
+        return this.driver.executeJSWithArray(scrollCode, [elementToScrollOn, elementToScrollTo, Boolean(step.isScrollToElement), Boolean(step.isDynamicScroll), expectedX, expectedY, step.shouldScrollLeft, step.shouldScrollTop])
             .then((res) => {
                 if(!res || !res.value) {
                     return {

package/player/stepActions/stepActionRegistrar.js

@@ -23,8 +23,6 @@ const ExtractTextStepAction = require('./extractTextStepAction');
 const TdkHybridStepAction = require('./tdkHybridStepAction');
 const PixelValidationStepAction = require('./pixelValidationStepAction');
 
-const SalesforceAutoLoginStepAction = require('./salesforceAutoLoginStepAction');
-
 const CliJsStepAction = require('./cliJsStepAction');
 const CliConditionStepAction = require('./cliConditionStepAction');
 const NodePackageStepAction = require('./nodePackageStepAction');
@@ -84,8 +82,6 @@ module.exports = function (driver, stepActionFactory, runMode) {
         'email-code-step': JsCodeStepAction,
         'cli-email-code-step': CliJsStepAction,
         'tdk-hybrid': TdkHybridStepAction,
-
-        'salesforce-autologin': SalesforceAutoLoginStepAction,
     };
 
     register(STEP_ACTION_MAPPING, stepActionFactory);

package/player/utils/eyeSdkService.js

@@ -8,7 +8,24 @@ const { EyeSdkBuilder } = require('../../commons/getSessionPlayerRequire');
 const { makeSDK } = require('@applitools/eyes-sdk-core');
 const { W3C_ELEMENT_ID } = require('../constants');
 const _ = require('lodash');
-const packageJson = require('../../../package.json');
+
+let packageJson;
+// There is a difference in the folder structure in prod vs. dev
+try {
+    // PRODUCTION
+    // eslint-disable-next-line import/no-unresolved
+    packageJson = require('../../package.json');
+} catch (e) {
+    //pass
+}
+if (!packageJson) {
+    try {
+        // in dev, they are one level up
+        packageJson = require('../../../package.json');
+    } catch (e) {
+        //pass
+    }
+}
 
 const LEGACY_ELEMENT_ID = 'ELEMENT';
 
@@ -218,10 +235,12 @@ class EyesSpec {
 
 class EyeSdkService {
     constructor() {
+        const sdkVersion = packageJson ? packageJson.dependencies['@applitools/eyes-sdk-core'] : 'N/A';
+
         /** @type {Core} */
         this.sdk = makeSDK({
             name: 'Testim.io',
-            version: `4.0.0/eyes-sdk-core/${packageJson.dependencies['@applitools/eyes-sdk-core']}`,
+            version: `4.0.0/eyes-sdk-core/${sdkVersion}`,
             spec: new EyesSpec(),
             VisualGridClient: require('@applitools/visual-grid-client'),
         });

package/runOptions.js

@@ -295,7 +295,9 @@ program
     .option('--require-credentials', 'Log in to Testim if not already logged in')
 
     // Tunnel
+    .option('tunneld', 'run a tunnel daemon only')
     .option('--tunnel [tunnel]', 'enable tunnel')
+    .option('--tunnel-routes [routes]', 'tunnel routes for cloudflare tunnels')
     .option('--tunnel-port [tunnel-port]', 'tunnel port address')
     .option('--tunnel-host-header [tunnel-host-header]', 'tunnel host header')
     .option('--tunnel-region [tunnel-region]', 'ngrok tunnel region')
@@ -522,6 +524,23 @@ module.exports = {
             throw err;
         }
 
+        if (program.tunneld) {
+            return {
+                tunnel: true,
+                tunnelPort: program.tunnelPort,
+                tunnelRoutes: program.tunnelRoutes,
+                tunnelRoutesOutput: program.tunnelRoutesOutput,
+                tunnelHostHeader: program.tunnelHostHeader,
+                tunnelRegion: program.tunnelRegion,
+                tunnelDiagnostics: program.tunnelDiagnostics,
+                tunnelUseHttpAddress: program.tunnelUseHttpAddress,
+                tunnelOnlyMode: true,
+                token: program.token,
+                project: program.project,
+            };
+        }
+
+
         const isTestConfigSpecified = (program.testConfig && program.testConfig.length) || (program.testConfigId && program.testConfigId.length);
         const isTestPlanSpecified = (program.testPlan && program.testPlan.length) || (program.testPlanId && program.testPlanId.length);
         const isSuiteSpecified = (program.suite && program.suite.length) || (program.suiteId && program.suiteId.length);
@@ -1108,6 +1127,8 @@ module.exports = {
             // Tunnel
             tunnel: program.tunnel,
             tunnelPort: program.tunnelPort,
+            tunnelRoutes: program.tunnelRoutes,
+            tunnelRoutesOutput: program.tunnelRoutesOutput,
             tunnelHostHeader: program.tunnelHostHeader,
             tunnelRegion: program.tunnelRegion,
             tunnelDiagnostics: program.tunnelDiagnostics,

package/runner.js

@@ -213,7 +213,7 @@ function runRunner(options, customExtensionLocalLocation) {
 
     return validateCliAccount(options)
         .log('in runRunner before tunnel.connect')
-        .then(() => tunnel.connect(options, testimCustomToken.getTokenV3UserData()))
+        .then(() => tunnel.connect(options))
         .log('in runRunner after tunnel.connect')
         .then(() => new TestPlanRunner(customExtensionLocalLocation).run(options))
         .log('before tunnel.disconnect')

package/runners/TestPlanRunner.js

@@ -79,7 +79,7 @@ class TestPlanRunner {
                 throw err;
             })
             .finally(async () => {
-                if ((tpOptions.lightweightMode && tpOptions.lightweightMode.disablePixelValidation) || !featureFlags.flags.applitoolsNewIntegration.isEnabled()) {
+                if ((tpOptions.lightweightMode && tpOptions.lightweightMode.disablePixelValidation)) {
                     return;
                 }
                 // When sessionPlayer is available, use it - as it only attempts to close batches that exist.
@@ -88,22 +88,25 @@ class TestPlanRunner {
                     await EyeSdkBuilder.closeBatch(executionId);
                     return;
                 }
+                /** @type {Awaited<ReturnType<typeof testimServicesApi['getApplitoolsIntegrationData']>>} */
+                let applitoolsIntegrationData;
                 try {
                     if (!tpOptions.company || !tpOptions.company.activePlan || !tpOptions.company.activePlan.premiumFeatures || !tpOptions.company.activePlan.premiumFeatures.applitools) {
                         return;
                     }
-                    const applitoolsIntegrationData = await testimServicesApi.getApplitoolsIntegrationData(tpOptions.project);
-                    if (_.isEmpty(applitoolsIntegrationData)) {
+                    applitoolsIntegrationData = await testimServicesApi.getApplitoolsIntegrationData(tpOptions.project);
+                    if (_.isEmpty(applitoolsIntegrationData) || !executionId) {
                         return;
                     }
                     const { runKey: apiKey, url: serverUrl } = applitoolsIntegrationData;
                     const tmpSDK = require('@applitools/eyes-sdk-core').makeSDK({ name: 'Testim.io', version: '4.0.0', spec: {} });
                     await tmpSDK.closeBatches({ batchIds: [executionId], serverUrl, apiKey });
                 } catch (err) {
-                    if (err.message && err.message.startsWith('Request failed with status code 404')) { // If a batch with this name did not exist, do not log an error.
+                    // If a batch with this name did not exist, do not log an error.
+                    if (err.message && (err.message.startsWith('Request failed with status code 404') || err.message.startsWith('no batchIds were set'))) {
                         return;
                     }
-                    logger.error('Failed closing batch in extension mode', { err, projectId: tpOptions.project });
+                    logger.error('Failed closing batch in extension mode', { err, projectId: tpOptions.project, applitoolsIntegrationData, batchIds: [executionId] });
                 }
             });
     }

package/services/gridService.js

@@ -258,7 +258,7 @@ async function getGridData(options) {
     if (grid) {
         return getGridDataByGridName(companyId, grid, allGrids);
     }
-    if (hasTestPlanFlag(options)) {
+    if (hasTestPlanFlag(options) || options.tunnelOnlyMode) {
         logger.info('skipping getting grid, as it is set on test plan', { companyId });
         return undefined;
     }

package/services/lambdatestService.js

@@ -13,6 +13,7 @@ const httpRequest = require('../commons/httpRequest');
 const { ArgError } = require('../errors');
 const servicesApi = require('../commons/testimServicesApi');
 const { getExtensionsUrl } = require('../runOptionsUtils');
+const featureFlagService = require('../commons/featureFlags');
 
 const logger = require('../commons/logger').getLogger('lambdatestService');
 
@@ -215,7 +216,7 @@ class LambdatestService {
             console: true,
             queueTimeout: 300, // time a session spends in the LT queue, in seconds (apparently 300 is the minimum)
             // visual: true, // [NOTE]: activate LT screenshots feature (can slow test).
-            // network: true, // [NOTE]: activate LT capture network logs feature (can cause network issues).
+            network: featureFlagService.flags.LTNetworkCapabilities.isEnabled(), // [NOTE]: activate LT capture network logs feature (can cause network issues).
             // fixedIP: '10.80.34.143', // [NOTE]: this is for debug purposes with LT team.
         };
     }

package/player/stepActions/salesforceAutoLoginStepAction.js

@@ -1,39 +0,0 @@
-const NavigationStepAction = require('./navigationStepAction');
-const Promise = require('bluebird');
-
-class SalesforceAutoLoginStepAction extends NavigationStepAction {
-    async performAction() {
-        let salesforceUrl = this.context.data.testimNavigationStepDestination || this.context.data.url;
-        try {
-            salesforceUrl = await this.updateBaseUrl(salesforceUrl);
-            await this.driver.url(salesforceUrl);
-            await Promise.delay(5000); // wait a little for the page to load (fixes screenshots and clicking on elements in username verification screen)
-            let newUrl = await this.driver.getUrl();
-            // Verify username screen
-            const isUsernameVerificationNeeded = newUrl.includes(this.step.USERNAME_VERIFICATION_PATH_ID);
-            const timeout = this.context.data.timeToPlayStep + 3000;
-            if (isUsernameVerificationNeeded) {
-                await this.driver.executeCodeAsync(`
-                    function ${this.step.handleUsernameVerificationAUTFunc.toString()}
-                    handleUsernameVerificationAUTFunc();
-                    var done = arguments[1];
-                    done();
-                `, timeout);
-                await Promise.delay(5000);
-                newUrl = await this.driver.getUrl(); // If we managed to continue correctly we want to get the new redirected url
-            }
-            await Promise.delay(1500);
-            return {
-                success: true,
-                newUrl,
-            };
-        } catch (err) {
-            return {
-                success: false,
-                reason: err.message,
-            };
-        }
-    }
-}
-
-module.exports = SalesforceAutoLoginStepAction;