@testim/testim-cli 3.263.0 → 3.265.0

package/commons/featureFlags.js

@@ -37,10 +37,8 @@ class FeatureFlagsService {
     constructor() {
         this.flags = {
             useNewWSCLI: new Rox.Flag(),
-            disableEdgeVisibilityChecks: new Rox.Flag(),
             useSafariWebdriverVisibilityChecks: new Rox.Flag(),
             useClickimVisibilityChecks: new Rox.Flag(),
-            useIEWebdriverVisibilityChecks: new Rox.Flag(),
             runGetElementCodeInAut: new Rox.Flag(),
             enableFrameSwitchOptimization: new Rox.Flag(),
             maximumJsResultSize: new Rox.Configuration(2000 * 1024),
@@ -53,7 +51,7 @@ class FeatureFlagsService {
             autoSaveDownloadFileFireFox: new Rox.Flag(true),
             safariSelectOptionDispatchEventOnSelectElement: new Rox.Flag(true),
             experimentalPreCodeCompilation: new Rox.Flag(true),
-            /** Enables using top level await inside custom actions for non-IE browsers */
+            /** Enables using top level await inside custom actions */
             experimentalAsyncCustomCode: new Rox.Flag(),
             useSameBrowserForMultiTests: new LabFeatureFlag('labs'),
             highSpeedMode: new LabFeatureFlag(),

package/commons/testimDesiredCapabilitiesBuilder.js

@@ -67,15 +67,6 @@ const convertToNewCapabilitiesFormat = (desiredCapabilities) => {
     }
 };
 
-function buildEdgeOptions(opts) {
-    Object.assign(opts.desiredCapabilities, {
-        browserName: 'MicrosoftEdge',
-        _isOldEdge: true,
-    });
-
-    return opts;
-}
-
 function buildSafariOptions(opts, browserName) {
     const safariOptions = { browserName: 'safari' };
 
@@ -87,48 +78,12 @@ function buildSafariOptions(opts, browserName) {
     return opts;
 }
 
-function buildIEOptions(opts, browserOptions, gridInfo, lambdatestService) {
-    const ieOptions = {
-        ignoreProtectedModeSettings: true,
-        'ie.ensureCleanSession': true,
-        'ie.enableFullPageScreenshot': false,
-        'ie.fileUploadDialogTimeout': 3000,
-        'ie.acceptSslCerts': true,
-    };
-
-    let version = '11';
-    if (isDFGrid(gridInfo)) {
-        version = 'latest';
-    }
-
-    Object.assign(opts.desiredCapabilities, {
-        browserName: 'internet explorer',
-        version,
-        pageLoadStrategy: 'none',
-    });
-
-    const isLambdatestRun = lambdatestService && lambdatestService.isLambdatestRun();
-    if (isLambdatestRun) {
-        opts.desiredCapabilities.ignoreProtectedModeSettings = true; // this might be the correct way to do it for all grids
-    }
-
-    if (browserOptions.oldCapabilities && !isLambdatestRun) {
-        Object.assign(opts.desiredCapabilities, ieOptions);
-    }
-
-    if (browserOptions.w3cCapabilities) {
-        opts.desiredCapabilities['se:ieOptions'] = ieOptions;
-    }
-
-    return opts;
-}
-
 function readFileToBase64(fileLocation) {
     return fs.readFileSync(fileLocation, { encoding: 'base64' });
 }
 
 function setCustomExtension(customExtensionLocalLocation, extensions, lambdatestService) {
-    if (lambdatestService && lambdatestService.isLambdatestRun() && utils.isURL(customExtensionLocalLocation)) {
+    if (lambdatestService?.isLambdatestRun() && utils.isURL(customExtensionLocalLocation)) {
         return;
     }
 
@@ -141,7 +96,7 @@ function setCustomExtension(customExtensionLocalLocation, extensions, lambdatest
 }
 
 function setTestimExtension(browserOptions, extensions, args, predefinedTestimExtension, lambdatestService) {
-    if (lambdatestService && lambdatestService.isLambdatestRun()) {
+    if (lambdatestService?.isLambdatestRun()) {
         return;
     }
 
@@ -219,7 +174,7 @@ function _buildChromiumOptions(opts, browserOptions, testRunConfig, customExtens
         args.push(`--user-data-dir=${browserOptions.chromeUserDataDir}`);
     }
 
-    if (browserOptions.projectData && browserOptions.projectData.defaults && browserOptions.projectData.defaults.disableChromiumGpu) {
+    if (browserOptions.projectData?.defaults?.disableChromiumGpu) {
         args.push('--disable-gpu');
     }
 
@@ -264,7 +219,7 @@ function _buildChromiumOptions(opts, browserOptions, testRunConfig, customExtens
         delete chromiumOptions.w3c;
     }
 
-    if (browserOptions.oldCapabilities && gridInfo.type !== 'testimEnterprise' && !(lambdatestService && lambdatestService.isLambdatestRun())) {
+    if (browserOptions.oldCapabilities && gridInfo.type !== 'testimEnterprise' && !lambdatestService?.isLambdatestRun()) {
         opts.desiredCapabilities[optionsKey] = chromiumOptions;
     }
 
@@ -353,13 +308,14 @@ function buildFirefoxOptions(opts, browserOptions) {
 }
 
 function buildSaucelabs(browserOptions, testName, testRunConfig) {
-    if (browserOptions.saucelabs && browserOptions.saucelabs.username && browserOptions.saucelabs.accessKey) {
+    const { saucelabs } = browserOptions;
+    if (saucelabs?.username && saucelabs.accessKey) {
         if (testRunConfig) {
             testRunConfig.sl.version = testRunConfig.browserValue === 'safari' ? testRunConfig.sl.safari_version : testRunConfig.sl.version;
-            testRunConfig.sl.appiumVersion = browserOptions.saucelabs.appiumVersion || testRunConfig.sl.appiumVersion;
-            return Object.assign({}, testRunConfig.sl, browserOptions.saucelabs, { name: testName });
+            testRunConfig.sl.appiumVersion = saucelabs.appiumVersion || testRunConfig.sl.appiumVersion;
+            return Object.assign({}, testRunConfig.sl, saucelabs, { name: testName });
         }
-        return Object.assign({}, browserOptions.saucelabs, { name: testName });
+        return Object.assign({}, saucelabs, { name: testName });
     }
     return {};
 }
@@ -524,8 +480,7 @@ function buildSeleniumOptions(browserOptions, testName, testRunConfig, gridInfo,
     }
 
     const browserTimeoutSec = Number(browserOptions.browserTimeout / 1000);
-    const browser = browserOptions.browser || (testRunConfig && testRunConfig.browserValue);
-
+    const browser = browserOptions.browser || testRunConfig?.browserValue;
 
     _.merge(
         opts.desiredCapabilities,
@@ -533,11 +488,11 @@ function buildSeleniumOptions(browserOptions, testName, testRunConfig, gridInfo,
         buildBrowserstack(browserOptions, testName, testRunConfig),
         buildPerfecto(browserOptions, testName, testRunConfig),
         buildExperitest(browserOptions, browser, browserTimeoutSec),
-        lambdatestService && lambdatestService.getCapabilities(browserOptions, browser, executionId, testResultId, testName),
+        lambdatestService?.getCapabilities(browserOptions, browser, executionId, testResultId, testName),
     );
 
     let predefinedTestimExtension = null;
-    if (!browserOptions.ext && !browserOptions.extensionPath && _.endsWith(gridInfo.host, '.testim.io') && !browserOptions.canary && browserOptions.mode === CLI_MODE.EXTENSION) {
+    if (!browserOptions.ext && !browserOptions.extensionPath && gridInfo.host?.endsWith('.testim.io') && !browserOptions.canary && browserOptions.mode === CLI_MODE.EXTENSION) {
         if (browser === 'chrome') {
             predefinedTestimExtension = '/opt/testim-headless';
         } else if (browser === 'edge-chromium') {
@@ -545,7 +500,7 @@ function buildSeleniumOptions(browserOptions, testName, testRunConfig, gridInfo,
         }
     }
 
-    if (_.endsWith(gridInfo.host, '.testim.io') && browser === 'edge-chromium') {
+    if (gridInfo.host?.endsWith('.testim.io') && browser === 'edge-chromium') {
         opts.desiredCapabilities.version = '83'; // Need to match GGR filter
     }
 
@@ -557,16 +512,10 @@ function buildSeleniumOptions(browserOptions, testName, testRunConfig, gridInfo,
         case 'firefox':
             opts = buildFirefoxOptions(opts, browserOptions);
             break;
-        case 'edge':
-            opts = buildEdgeOptions(opts);
-            break;
         case 'safari':
         case 'safari technology preview':
             opts = buildSafariOptions(opts, browser);
             break;
-        case 'ie11':
-            opts = buildIEOptions(opts, browserOptions, gridInfo, lambdatestService);
-            break;
         default:
             break;
     }
@@ -582,7 +531,12 @@ function buildSeleniumOptions(browserOptions, testName, testRunConfig, gridInfo,
          */
         const hostToProvider = { 'hub.lambdatest.com': 'lambdatest', 'public-grid.testim.io': 'testim', 'testgrid-devicefarm.us-west-2.amazonaws.com': 'devicefarm' };
         const byGrid = (capabilities) => capabilities[gridInfo.provider] || capabilities[opts.host] || capabilities[hostToProvider[opts.host]];
-        const getTargetingGroup = (capabilities) => byGrid(capabilities) || capabilities[opts.desiredCapabilities.browserName] || capabilities[opts.desiredCapabilities.version] || capabilities || {};
+        const getTargetingGroup = capabilities =>
+            byGrid(capabilities) ||
+            capabilities[opts.desiredCapabilities?.browserName] ||
+            capabilities[opts.desiredCapabilities?.version] ||
+            capabilities ||
+            {};
         const capabilities = JSON.parse(featureFlags.flags.addCustomCapabilities.getValue() || '{}');
         const customCapabilities = getTargetingGroup(getTargetingGroup(capabilities));
 
@@ -590,8 +544,11 @@ function buildSeleniumOptions(browserOptions, testName, testRunConfig, gridInfo,
             logger.info(`Adding custom capabilities: ${JSON.stringify(customCapabilities)}`);
             Object.assign(opts.desiredCapabilities, customCapabilities);
         }
-    } catch (e) {
-        logger.error(`Failed to load custom capabilities: ${e.message}`, { customCapabilities: featureFlags.flags.addCustomCapabilities.getValue() });
+    } catch (error) {
+        logger.error('Failed to load custom capabilities', {
+            error,
+            customCapabilities: featureFlags.flags.addCustomCapabilities.getValue(),
+        });
     }
 
     if (isDFGrid(gridInfo) && opts.desiredCapabilities && !opts.capabilities) {