@testim/testim-cli 3.247.0 → 3.248.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.247.0",
+  "version": "3.248.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{
@@ -17,15 +17,11 @@
     "@types/node": "10.17.24",
     "@types/selenium-webdriver": "4.0.9",
     "bundle-deps": "1.0.0",
-    "chai": "4.3.6",
-    "chai-as-promised": "7.1.1",
     "gulp": "4.0.2",
     "gulp-cli": "2.3.0",
     "gulp-json-editor": "2.5.6",
     "gulp-preprocess": "3.0.3",
     "merge-stream": "2.0.0",
-    "mocha": "9.2.0",
-    "nyc": "15.1.0",
     "proxyquire": "2.1.3",
     "request": "2.88.2",
     "sinon": "9.0.2",

package/player/stepActions/scripts/selectOption.js

@@ -1,13 +1,18 @@
+/* eslint-disable no-restricted-syntax */ // This code only runs in Safari, not in IE.
 module.exports = function (locatedElement, dispatchEventOnSelectElement) {
     function closest(el, selectors) {
+        var originalMatches = Element.prototype.matches;
+        /* eslint-disable-next-line no-proto, no-undef */ // Some customers override the native Element prototype, so we need to create a new one if they messed it up.
+        var matches = originalMatches && isNativeFunction(originalMatches) ? originalMatches : document.createElement(el.tagName).__proto__.matches;
         do {
-            if (Element.prototype.matches.call(el, selectors)) return el;
+            if (matches.call(el, selectors)) return el;
             el = el.parentElement || el.parentNode;
         } while (el !== null && el.nodeType === 1);
         return null;
     }
 
     try {
+        /* eslint-disable-next-line no-undef */ // This code depends on pre-injecting this function as well.
         var optionEl = getLocatedElement(locatedElement);
         if (!optionEl) {
             return { success: false, status: 'failed', result: 'option element not found' };

package/player/stepActions/selectOptionStepAction.js

@@ -2,42 +2,48 @@
 
 const StepAction = require('./stepAction');
 const { extractElementId } = require('../../utils');
-const { codeSnippets } = require('../../commons/getSessionPlayerRequire');
+const { codeSnippets, utils } = require('../../commons/getSessionPlayerRequire');
 const selectOption = require('./scripts/selectOption');
 const featureFlags = require('../../commons/featureFlags');
 
 class SelectOptionStepAction extends StepAction {
-    performAction() {
+    async performAction() {
         const target = this.context.data[this.step.targetId || 'targetId'];
         const { seleniumElement, locatedElement } = target;
 
-        return this.driver.getBrowserAndOS()
-            .then(browserAndOS => {
-                const browserMajor = browserAndOS.browserMajor;
-                const isSafari = this.driver.isSafari();
-                const isShadowed = Boolean(this.step.element && this.step.element.isShadowed);
+        const browserAndOS = await this.driver.getBrowserAndOS();
 
-                // TODO: Remove the special handling for safari < 12 after we upgrade our grid to safari 13.
-                // force use js code when element is shadow dom
-                if (!isSafari || (isSafari && browserMajor >= 13 && !isShadowed)) {
-                    return this.driver.elementIdClick(extractElementId(seleniumElement));
+        const browserMajor = browserAndOS.browserMajor;
+        const isSafari = this.driver.isSafari();
+        const isShadowed = Boolean(this.step.element && this.step.element.isShadowed);
+
+        // TODO: Remove the special handling for safari < 12 after we upgrade our grid to safari 13.
+        // force use js code when element is shadow dom
+        if (!isSafari || (isSafari && browserMajor >= 13 && !isShadowed)) {
+            try {
+                const res = await this.driver.elementIdClick(extractElementId(seleniumElement));
+                return res;
+            } catch (err) {
+                // If customer overrides the native Element prototype, this click will fail for this reason. in such a case, fallback to use js code.
+                if (!err.message.includes('Cannot check the displayedness of a non-Element argument')) {
+                    throw err;
                 }
+            }
+        }
+
+        const safariSelectOptionDispatchEventOnSelectElement = featureFlags.flags.safariSelectOptionDispatchEventOnSelectElement.isEnabled();
+        const selectOptionCode = `
+            var getLocatedElement = ${codeSnippets.getLocatedElementCode};
+            var isNativeFunction = ${utils.isNativeFunction.toString()};
+            var selectOption = ${selectOption.toString()};
+            return selectOption.apply(null, arguments);
+        `;
 
-                const safariSelectOptionDispatchEventOnSelectElement = featureFlags.flags.safariSelectOptionDispatchEventOnSelectElement.isEnabled();
-                const selectOptionCode = `
-                    var getLocatedElement = ${codeSnippets.getLocatedElementCode};
-                    var selectOption = ${selectOption.toString()};
-                    return selectOption.apply(null, arguments);
-                `;
-
-                return this.driver.executeJSWithArray(selectOptionCode, [locatedElement, safariSelectOptionDispatchEventOnSelectElement])
-                    .then(result => {
-                        if (result.value && result.value.success) {
-                            return { success: true };
-                        }
-                        return { success: false };
-                    });
-            });
+        const result = await this.driver.executeJSWithArray(selectOptionCode, [locatedElement, safariSelectOptionDispatchEventOnSelectElement]);
+        if (result.value && result.value.success) {
+            return { success: true };
+        }
+        return { success: false };
     }
 }
 

package/workers/WorkerSelenium.js

@@ -66,7 +66,7 @@ class WorkerSelenium extends BaseWorker {
             await this.windowUtils.validatePageIsAvailable();
             perf.log('in WorkerSelenium after navigate');
         } catch (err) {
-            const firefoxPageNotAvailable = (err.message.startsWith('Malformed URL') || err.message.includes('Reached error page: about:neterror')) &&
+            const firefoxPageNotAvailable = err.message && (err.message.startsWith('Malformed URL') || err.message.includes('Reached error page: about:neterror')) &&
                 browserValue === 'firefox';
 
             const invalidURL = (err.message && err.message === 'invalid argument');