@testim/testim-cli 3.263.0 → 3.265.0

package/player/webdriver.js

@@ -80,8 +80,7 @@ class WebDriver extends WebDriverApi {
         if (capabilities.capabilities) {
             delete capabilities.capabilities.alwaysMatch.marionette;
         }
-        const browser = browserOptions.browser || (testRunConfig?.browserValue);
-        this.initUnsupportedActions(browser, lambdatestService?.isLambdatestRun());
+        this.initUnsupportedActions(lambdatestService?.isLambdatestRun());
         this.browserAndOS = null;
         this.seleniumPerfStats = seleniumPerfStats;
         const driverDelay = fastInit ? 0 : 1500;
@@ -110,8 +109,8 @@ class WebDriver extends WebDriverApi {
         }
     }
 
-    initUnsupportedActions(browser, isLambdatestRun) {
-        if (isLambdatestRun && browser !== 'ie11' && browser !== 'edge') {
+    initUnsupportedActions(isLambdatestRun) {
+        if (isLambdatestRun) {
             this.unsupportedActions = {
                 ...this.unsupportedActions,
                 move: true,
@@ -391,15 +390,7 @@ class WebDriver extends WebDriverApi {
                 if (isTextElement(element)) {
                     return element.value;
                 } else if (element instanceof SVGElement) {
-                    var isIE = navigator.userAgent.indexOf('MSIE') !== -1
-                        || navigator.userAgent.indexOf('Trident/') !== -1;
-
                     var copyElement = element.cloneNode(true);
-                    // clone doesn't work for SVG elements in IE11
-                    if (isIE) {
-                        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, '');
                 } else {
                     return getFixedTextContent(element);
@@ -436,9 +427,6 @@ class WebDriver extends WebDriverApi {
         return this.executeJS(getHTMLCode)
             .then(result => {
                 this.seleniumPerfStats.markEnd(perfId, SELENIUM_PERF_MARKS.GET_HTML);
-                if (this.isIE() && result.value.runLocation && this.isIePageNotAvailableUrl(result.value.runLocation.href)) {
-                    throw this.getIeError('Page is not loaded');
-                }
                 return result.value;
             })
             .catch(err => !(err instanceof IeError), err => {
@@ -449,15 +437,7 @@ class WebDriver extends WebDriverApi {
                     testimInternalError.extraInfo = 'Inside getHtml catch and trying to check if in quirks mode - but the session has already terminated';
                     throw testimInternalError;
                 }
-                if (!this.isIE()) { // no need to check quirks mode if I'm not in IE
-                    throw testimInternalError;
-                }
-                return this.executeJS('return navigator.userAgent;')
-                    .catch(() => { throw testimInternalError; })
-                    .then(ua => {
-                        const error = this.isUsingUnsupportedCompabilityMode(ua.value) ? this.getIeError('Can’t run test in IE compatibility mode') : testimInternalError;
-                        throw error;
-                    });
+                throw testimInternalError;
             });
     }
 
@@ -469,10 +449,9 @@ class WebDriver extends WebDriverApi {
         const MAX_TRIES = 5;
 
         const getViewportSizeScript = function () {
-            var pixelRatio = (/(MSIE)|(Trident)/.test(navigator.userAgent)) ? (window.screen.systemXDPI / window.screen.deviceXDPI) : 1;
             return {
-                screenWidth: Math.floor(window.innerWidth || 0) / pixelRatio,
-                screenHeight: Math.floor(window.innerHeight || 0) / pixelRatio
+                screenWidth: Math.floor(window.innerWidth || 0),
+                screenHeight: Math.floor(window.innerHeight || 0)
             };
         };
 
@@ -649,15 +628,14 @@ class WebDriver extends WebDriverApi {
     }
 
     doubleClickWithJS(eventData) {
-        const eventParam = this.isEdge() ? JSON.stringify(eventData) : eventData;
         return this.executeCodeAsync(`
             var getLocatedElement = ${codeSnippets().getLocatedElementCode};
             var dispatchFocus = ${dispatchFocus.toString()};
             var doubleClick = ${doubleClick.toString()};
-            var eventData = ${this.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
+            var eventData = arguments[0];
             var done = arguments[1];
             return doubleClick.call(null, eventData, done);
-        `, eventData.timeout, eventParam);
+        `, eventData.timeout, eventData);
     }
 
     // eslint-disable-next-line default-param-last
@@ -740,8 +718,8 @@ class WebDriver extends WebDriverApi {
         const { rect, clickOffset } = offsets;
         const center = this.inViewCenter(rect);
         // moveto element (actions and legacy) is always vs. the center of an element, so the offset needs to get fixed.
-        const xOffset = this.isEdge() ? clickOffset.x : Math.floor(clickOffset.x - center.x);
-        const yOffset = this.isEdge() ? clickOffset.y : Math.floor(clickOffset.y - center.y);
+        const xOffset = Math.floor(clickOffset.x - center.x);
+        const yOffset = Math.floor(clickOffset.y - center.y);
 
         return this.moveTo(extractElementId(seleniumElement), xOffset, yOffset)
             .catch(err => {
@@ -813,8 +791,8 @@ class WebDriver extends WebDriverApi {
 
     drag(seleniumElement, targetRect, xElementOffset, yElementOffset, events) {
         const { width, height } = targetRect;
-        const midXRelative = this.isEdge() ? xElementOffset : (xElementOffset - width / 2 + 1);
-        const midYRelative = this.isEdge() ? yElementOffset : (yElementOffset - height / 2);
+        const midXRelative = (xElementOffset - width / 2 + 1);
+        const midYRelative = (yElementOffset - height / 2);
         return this.getDragCoordinates(events)
             .then(coordinates => {
                 const { xDiff, yDiff } = coordinates;
@@ -893,7 +871,7 @@ class WebDriver extends WebDriverApi {
     }
 
     dragAndDrop(sourceSeleniumElement, destinationSeleniumElement, rectsAndOffsets) {
-        if (this.isEdge() || this.isSafari() || this.isIE()) {
+        if (this.isSafari()) {
             if (this.unsupportedActions.move) {
                 return this.dragAndDropWithActionsAPIWithGeneratedMoves(rectsAndOffsets);
             }

package/runOptions.d.ts

@@ -163,7 +163,7 @@ interface RunnerOptions extends Partial<Omit<TunnelOptions, 'tunnelOnlyMode' | '
     useChromeLauncher?: boolean;
 
     disableGridCheck: boolean;
-    browser?: 'ie11' | 'ie' | 'internet explorer' | 'edge' | 'edge-chromium' | 'firefox' | 'safari' | 'chrome';
+    browser?: 'edge-chromium' | 'firefox' | 'safari' | 'chrome';
 
     proxyForGrid: string;
 

package/runOptions.js

@@ -452,13 +452,8 @@ module.exports = {
 
         if (program.playerRequirePath) {
             const fullPlayerPath = path.resolve(program.playerRequirePath);
-            let projectFile;
             console.log('Using Local Clickim for Player Require Path =', fullPlayerPath);
-            if (program.browser && ['ie11', 'ie', 'internet explorer'].includes(program.browser.toLowerCase())) {
-                projectFile = path.join(fullPlayerPath, 'tsconfig.ie11.json');
-            } else {
-                projectFile = path.join(fullPlayerPath, 'tsconfig.node.json');
-            }
+            const projectFile = path.join(fullPlayerPath, 'tsconfig.node.json');
 
             // [NOTE] playerRequirePath is a dev flag
             // eslint-disable-next-line import/no-extraneous-dependencies
@@ -655,9 +650,6 @@ module.exports = {
                         case 'microsoftedge':
                             program.browser = 'edge';
                             break;
-                        case 'internet explorer':
-                            program.browser = 'ie';
-                            break;
                         default:
                             program.browser = browserName;
                     }

package/runners/runnerUtils.js

@@ -60,7 +60,7 @@ async function validateConfig(options, testList) {
     const supportedBrowsers = options.mode === 'extension' ? [
         'edge-chromium', 'chrome',
     ] : [
-        'ie11', 'firefox', 'chrome', 'edge', 'edge-chromium', 'safari', 'safari technology preview', 'browser', 'android', 'ios', 'iphone', 'ipad',
+        'firefox', 'chrome', 'edge-chromium', 'safari', 'safari technology preview', 'browser', 'android', 'ios', 'iphone', 'ipad',
     ];
     const diff = _.difference(utils.getUniqBrowsers(options, testList), supportedBrowsers);
 

package/utils/promiseUtils.js

@@ -39,9 +39,10 @@ function delay(time) {
  * @param {string=} errMsg
  */
 function promiseTimeout(promise, timeout, errMsg = 'Timeout Error') {
+    const timeoutErr = new TimeoutError(errMsg);
     return Promise.race([
         promise,
-        delay(timeout).then(() => { throw new TimeoutError(errMsg); }),
+        delay(timeout).then(() => { throw timeoutErr; }),
     ]);
 }