@testim/testim-cli 3.226.0 → 3.229.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.226.0",
+  "version": "3.229.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{
@@ -12,16 +12,16 @@
   },
   "devDependencies": {
     "@types/bluebird": "3.5.32",
-    "@types/fs-extra": "8.1.0",
+    "@types/fs-extra": "9.0.13",
     "@types/ms": "0.7.31",
     "@types/node": "10.17.24",
     "@types/selenium-webdriver": "4.0.9",
     "bundle-deps": "1.0.0",
-    "chai": "4.3.4",
+    "chai": "4.3.6",
     "chai-as-promised": "7.1.1",
     "gulp": "4.0.2",
     "gulp-cli": "2.3.0",
-    "gulp-json-editor": "2.5.4",
+    "gulp-json-editor": "2.5.6",
     "gulp-preprocess": "3.0.3",
     "merge-stream": "2.0.0",
     "mocha": "9.2.0",
@@ -32,7 +32,7 @@
     "sinon-chai": "3.7.0",
     "ts-node": "9.1.1",
     "tsconfig-paths": "3.12.0",
-    "typescript": "4.5.5"
+    "typescript": "4.6.2"
   },
   "lazyDependencies": {
     "ngrok": "3.4.0",
@@ -44,40 +44,40 @@
     "istanbul-lib-coverage": "3.0.0",
     "@bcoe/v8-coverage": "0.2.3",
     "convert-source-map": "1.7.0",
-    "multer": "1.4.2"
+    "multer": "1.4.4"
   },
   "dependencies": {
-    "@applitools/eyes-sdk-core": "13.0.0",
-    "@applitools/visual-grid-client": "15.8.62",
+    "@applitools/eyes-sdk-core": "13.0.6",
+    "@applitools/visual-grid-client": "15.9.0",
     "@testim/coralogix-logger": "1.1.27-beta.1",
     "@testim/webdriverio": "0.0.5",
     "abort-controller": "3.0.0",
     "ajv": "6.12.6",
     "analytics-node": "5.0.0",
     "appium-dom-utils": "1.0.6",
-    "archiver": "3.1.1",
+    "archiver": "5.3.0",
     "bluebird": "3.7.2",
     "bluebird-retry": "0.11.0",
     "body-parser": "1.19.1",
-    "chalk": "4.1.0",
-    "chrome-launcher": "0.13.4",
+    "chalk": "4.1.2",
+    "chrome-launcher": "0.15.0",
     "combine-source-map": "0.8.0",
     "commander": "2.9.0",
     "compression": "1.7.4",
     "cors": "2.8.5",
-    "crypto-js": "4.0.0",
+    "crypto-js": "4.1.1",
     "data-uri-to-buffer": "2.0.2",
     "decompress": "4.2.1",
-    "express": "4.17.1",
+    "express": "4.17.3",
     "find-root": "1.1.0",
-    "fkill": "7.0.1",
+    "fkill": "7.2.1",
     "form-data": "3.0.0",
-    "fs-extra": "8.1.0",
-    "glob": "7.1.6",
+    "fs-extra": "10.0.1",
+    "glob": "7.2.0",
     "istanbul-lib-report": "3.0.0",
     "istanbul-reports": "3.0.2",
     "jimp": "0.16.1",
-    "jsdom": "16.7.0",
+    "jsdom": "19.0.0",
     "jsonwebtoken": "8.5.1",
     "lodash": "4.17.21",
     "memory-fs": "0.5.0",
@@ -86,8 +86,8 @@
     "moment": "2.25.3",
     "ms": "2.1.2",
     "npm": "8.3.0",
-    "object-hash": "2.0.3",
-    "ora": "4.0.4",
+    "object-hash": "3.0.0",
+    "ora": "5.4.1",
     "pako": "1.0.11",
     "portfinder": "1.0.28",
     "promise-queue": "2.2.5",
@@ -103,9 +103,9 @@
     "threads": "0.12.0",
     "ua-parser-js": "0.7.28",
     "validate-npm-package-name": "3.0.0",
-    "winston": "3.3.3",
-    "winston-transport": "4.4.0",
-    "ws": "8.2.3",
+    "winston": "3.6.0",
+    "winston-transport": "4.5.0",
+    "ws": "8.5.0",
     "xml2js": "0.4.23",
     "yaml": "1.10.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/services/gridService.js

@@ -237,25 +237,7 @@ function getOptionGrid(options) {
 
 async function getTestPlanGridData(options, testPlanData) {
     const companyId = options.company.companyId;
-    try {
-        return await getGridDataByGridId(companyId, testPlanData.gridId, options.allGrids);
-    } catch (err) {
-        if (err instanceof ArgError) {
-            // this is a fallback to an old behavior that is wrong,
-            // we should remove it in the future
-            const testPlanDatas = await servicesApi.getTestPlan(options.project, options.testPlan);
-            if (testPlanDatas.length === 0) {
-                throw new ArgError(`no test plan to run ${options.testPlan}`);
-            }
-            const testPlanGrids = testPlanDatas.map(d => options.allGrids.find(grid => grid._id === d.gridId));
-            if (testPlanGrids.includes(undefined)) {
-                throw new ArgError('failed to find one of the test plan defined grid');
-            }
-            logger.warn('getTestPlanGridData used fallback and might cause test plans run on a unintended grid', { companyId });
-            return getSerializableObject(_.first(testPlanGrids));
-        }
-        throw err;
-    }
+    return await getGridDataByGridId(companyId, testPlanData.gridId, options.allGrids);
 }
 
 async function getGridData(options) {