@testim/testim-cli 3.228.0 → 3.231.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.228.0",
+  "version": "3.231.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{
@@ -47,8 +47,8 @@
     "multer": "1.4.4"
   },
   "dependencies": {
-    "@applitools/eyes-sdk-core": "13.0.6",
-    "@applitools/visual-grid-client": "15.9.0",
+    "@applitools/eyes-sdk-core": "13.2.0",
+    "@applitools/visual-grid-client": "15.11.0",
     "@testim/coralogix-logger": "1.1.27-beta.1",
     "@testim/webdriverio": "0.0.5",
     "abort-controller": "3.0.0",

package/player/stepActions/inputFileStepAction.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const StepAction = require('./stepAction');
-const Promise = require('bluebird');
 const _ = require('lodash');
 const logger = require('../../commons/logger').getLogger('input-file-step-action');
 const { codeSnippets, utils } = require('../../commons/getSessionPlayerRequire');
@@ -26,53 +25,58 @@ class InputFileStepAction extends StepAction {
         return this.driver.executeJS(getVisibleElementCode, target.locatedElement);
     }
 
-    safariPreUploadActions(target) {
+    async safariPreUploadActions(target) {
         const options = {
             width: '150px',
             height: '150px',
             left: '10px',
             top: '10px',
         };
-        return this.forceInputToBeVisible(target, options)
-            .catch(err => {
-                logger.error('failed to set input file in Safari recovery', { err });
-                throw err;
-            });
+        try {
+            return await this.forceInputToBeVisible(target, options);
+        } catch (err) {
+            logger.error('failed to set input file in Safari recovery', { err });
+            throw err;
+        }
     }
 
-    uploadFilesAndForceVisibility(gridLocalFiles, target) {
+    async uploadFilesAndForceVisibility(gridLocalFiles, target) {
         const preUploadStep = this.driver.isSafari() ?
-            //     // in safari we force the visibility ahead of time because making it visible the second time around doesn't work
+            // in safari we force the visibility ahead of time because making it visible the second time around doesn't work
             this.safariPreUploadActions(target) :
             Promise.resolve();
 
-        return preUploadStep.then(() => this.uploadFiles(gridLocalFiles, target))
-            .catch(err => {
-                const edgeErrorEditableMessage = 'The element is not editable';
-                const edgeErrorFocusableMessage = 'The element is not focusable';
-                const safariErrorVisibleMessege = 'An element command could not be completed because the element is not visible on the page.';
-                const elementNotInteractable = 'element not interactable';
-                const elementNotPointerOrKeyboardInteractable = 'element is not pointer- or keyboard interactable';
-                const invalidStateMsg = 'invalid element state: Element is not currently interactable and may not be manipulated';
-                const mustBeVisibleMsg = 'Element must not be hidden, disabled or read-only';
-                const notReachableByKeyboard = 'is not reachable by keyboard';
-                const errorMsg = err ? err.message : '';
-                // Workaround move element if element is not visible or disabled
-                if (_.isEqual(errorMsg, invalidStateMsg) ||
-                    _.startsWith(errorMsg, mustBeVisibleMsg) ||
-                    _.startsWith(errorMsg, edgeErrorEditableMessage) ||
-                    _.startsWith(errorMsg, edgeErrorFocusableMessage) ||
-                    _.startsWith(errorMsg, safariErrorVisibleMessege) ||
-                    _.includes(errorMsg, notReachableByKeyboard) ||
-                    _.includes(errorMsg, elementNotInteractable) ||
-                    _.includes(errorMsg, elementNotPointerOrKeyboardInteractable)
-                ) {
-                    return this.forceInputToBeVisible(target).then(() => this.uploadFiles(gridLocalFiles, target));
-                }
+        try {
+            await preUploadStep;
+            await this.uploadFiles(gridLocalFiles, target);
+        } catch (err) {
+            const edgeErrorEditableMessage = 'The element is not editable';
+            const edgeErrorFocusableMessage = 'The element is not focusable';
+            const safariErrorVisibleMessege = 'An element command could not be completed because the element is not visible on the page.';
+            const elementNotInteractable = 'element not interactable';
+            const elementNotPointerOrKeyboardInteractable = 'element is not pointer- or keyboard interactable';
+            const invalidStateMsg = 'invalid element state: Element is not currently interactable and may not be manipulated';
+            const mustBeVisibleMsg = 'Element must not be hidden, disabled or read-only';
+            const notReachableByKeyboard = 'is not reachable by keyboard';
+            const errorMsg = err ? err.message : '';
+            // Workaround move element if element is not visible or disabled
+            if (_.isEqual(errorMsg, invalidStateMsg) ||
+                _.startsWith(errorMsg, mustBeVisibleMsg) ||
+                _.startsWith(errorMsg, edgeErrorEditableMessage) ||
+                _.startsWith(errorMsg, edgeErrorFocusableMessage) ||
+                _.startsWith(errorMsg, safariErrorVisibleMessege) ||
+                _.includes(errorMsg, notReachableByKeyboard) ||
+                _.includes(errorMsg, elementNotInteractable) ||
+                _.includes(errorMsg, elementNotPointerOrKeyboardInteractable)
+            ) {
+                await this.forceInputToBeVisible(target);
+                await this.uploadFiles(gridLocalFiles, target);
+                return;
+            }
 
-                logger.error('failed to set input file', { err });
-                return Promise.reject(err);
-            });
+            logger.error('failed to set input file', { err });
+            throw err;
+        }
     }
 
     async uploadFiles(gridLocalFiles, target) {
@@ -81,31 +85,22 @@ class InputFileStepAction extends StepAction {
         }
     }
 
-    performAction() {
+    async performAction() {
         const target = this.context.data[this.step.targetId || 'targetId'];
         const overrideAzureStorageUrl = featureFlagService.flags.overrideAzureStorageUrl.isEnabled();
-        //TODO remove if after release session player
-        return (utils.addTokenToFileUrl ? utils.addTokenToFileUrl(
-            this.context.project.id,
-            this.step.fileUrls,
-            this.stepActionUtils.testimServicesApi,
-            overrideAzureStorageUrl,
-            logger,
-        ) : Promise.resolve(this.step.fileUrls)).then((fileUrls) => {
-            const useJsInputCodeInSafari = featureFlagService.flags.useJsInputCodeInSafari.isEnabled();
-            if (this.driver.isSafari() && (useJsInputCodeInSafari || fileUrls.length > 1)) {
-                return this.driver.executeJSWithArray(`
+
+        const fileUrls = await utils.addTokenToFileUrl(this.context.project.id, this.step.fileUrls, this.stepActionUtils.testimServicesApi, overrideAzureStorageUrl, logger);
+        const useJsInputCodeInSafari = featureFlagService.flags.useJsInputCodeInSafari.isEnabled();
+        if (this.driver.isSafari() && (useJsInputCodeInSafari || fileUrls.length > 1)) {
+            await this.driver.executeJSWithArray(`
                 const getLocatedElement = ${codeSnippets.getLocatedElementCode};
                 const downloadAndUploadFile = ${downloadAndUpload()};
-                return downloadAndUploadFile.apply(null, arguments);`,
-                [target.locatedElement, fileUrls])
-                    .then(() => Promise.resolve());
-            }
+                return downloadAndUploadFile.apply(null, arguments);`, [target.locatedElement, fileUrls]);
+            return;
+        }
 
-            return inputFileUtils.downloadFilesAndUploadToGrid(fileUrls, this.uploadFile.bind(this))
-                .then(gridLocalFiles => this.uploadFilesAndForceVisibility(gridLocalFiles, target))
-                .then(() => Promise.resolve());
-        });
+        const gridLocalFiles = await inputFileUtils.downloadFilesAndUploadToGrid(fileUrls, this.uploadFile.bind(this));
+        await this.uploadFilesAndForceVisibility(gridLocalFiles, target);
     }
 }
 
@@ -138,8 +133,35 @@ function downloadAndUpload() {
             throw new Error('element not found');
         }
 
+        function getFileBlob(url) {
+            return new Promise((resolve, reject) => {
+                var xhr = new XMLHttpRequest();
+                xhr.open('GET', url, true);
+                xhr.responseType = 'blob';
+
+                xhr.onload = function() {
+                    if (this.status === 200) {
+                        resolve(this.response);
+                    } else {
+                        reject(new Error('Could not load file, failure status:' + this.status));
+                    }
+                }
+                xhr.onerror = function(e) {
+                    reject(new Error("Error " + e.target.status + " occurred while loading the file."));
+                };
+                xhr.send();
+            });
+
+        }
+
         const fileList = await Promise.all(fileUrls.map(async ({ url, name }) => {
-            const blob = await fetch(url).then(r => r.blob());
+            let blob;
+            try {
+                const res = await fetch(url)
+                blob = await res.blob();
+            } catch (err) {
+                blob = await getFileBlob(url); // Sometimes the fetch fails, try using XHR as fallback
+            }
             return new File([blob], name, { type: blob.type });
         }));
 

package/player/utils/eyeSdkService.js

@@ -9,6 +9,24 @@ const { makeSDK } = require('@applitools/eyes-sdk-core');
 const { W3C_ELEMENT_ID } = require('../constants');
 const _ = require('lodash');
 
+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';
 
 function extractElementId(element) {
@@ -217,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',
+            version: `4.0.0/eyes-sdk-core/${sdkVersion}`,
             spec: new EyesSpec(),
             VisualGridClient: require('@applitools/visual-grid-client'),
         });