@testim/testim-cli 3.267.0 → 3.269.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.267.0",
+  "version": "3.269.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@testim/testim-cli",
-      "version": "3.267.0",
+      "version": "3.269.0",
       "license": "Proprietary",
       "dependencies": {
         "@applitools/eyes-sdk-core": "13.11.21",
@@ -1460,9 +1460,9 @@
       }
     },
     "node_modules/@wdio/types/node_modules/@types/node": {
-      "version": "18.11.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-      "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+      "version": "18.11.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+      "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
     },
     "node_modules/@wdio/utils": {
       "version": "7.24.0",
@@ -4416,9 +4416,9 @@
       "integrity": "sha512-+iipnm2hvmlWs4MVNx7HwSTxhDxsXnQyK5F1OalZVXeUhdPgP/23T42NCyg0TK3wL/Yg92SVrSuGKqdg12o54w=="
     },
     "node_modules/devtools/node_modules/@types/node": {
-      "version": "18.11.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-      "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+      "version": "18.11.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+      "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
     },
     "node_modules/devtools/node_modules/ua-parser-js": {
       "version": "1.0.32",
@@ -6216,9 +6216,9 @@
       }
     },
     "node_modules/got": {
-      "version": "11.8.5",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
       "dependencies": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
@@ -15393,9 +15393,9 @@
       }
     },
     "node_modules/vm2": {
-      "version": "3.9.12",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.12.tgz",
-      "integrity": "sha512-OMmRsKh1gmdosFzuqmj6O43hqIStqXA24YbwjtUTO0TkOBP8yLNHLplbr4odnAzEcMnm9lt2r3R8kTivn8urMg==",
+      "version": "3.9.13",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz",
+      "integrity": "sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q==",
       "dependencies": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -15468,9 +15468,9 @@
       }
     },
     "node_modules/webdriver/node_modules/@types/node": {
-      "version": "18.11.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-      "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+      "version": "18.11.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+      "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
     },
     "node_modules/webdriverio": {
       "version": "7.24.0",
@@ -15510,9 +15510,9 @@
       }
     },
     "node_modules/webdriverio/node_modules/@types/node": {
-      "version": "18.11.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-      "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+      "version": "18.11.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+      "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
     },
     "node_modules/webdriverio/node_modules/brace-expansion": {
       "version": "2.0.1",
@@ -17129,9 +17129,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.11",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-          "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+          "version": "18.11.15",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+          "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
         }
       }
     },
@@ -19496,9 +19496,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.11",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-          "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+          "version": "18.11.15",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+          "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
         },
         "ua-parser-js": {
           "version": "1.0.32",
@@ -20937,9 +20937,9 @@
       }
     },
     "got": {
-      "version": "11.8.5",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
       "requires": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
@@ -27933,9 +27933,9 @@
       }
     },
     "vm2": {
-      "version": "3.9.12",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.12.tgz",
-      "integrity": "sha512-OMmRsKh1gmdosFzuqmj6O43hqIStqXA24YbwjtUTO0TkOBP8yLNHLplbr4odnAzEcMnm9lt2r3R8kTivn8urMg==",
+      "version": "3.9.13",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.13.tgz",
+      "integrity": "sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q==",
       "requires": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -27994,9 +27994,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.11",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-          "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+          "version": "18.11.15",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+          "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
         }
       }
     },
@@ -28035,9 +28035,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.11",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.11.tgz",
-          "integrity": "sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g=="
+          "version": "18.11.15",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
+          "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw=="
         },
         "brace-expansion": {
           "version": "2.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.267.0",
+  "version": "3.269.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{

package/player/extensionTestPlayer.js

@@ -1,6 +1,6 @@
-"use strict";
+'use strict';
 
-const Promise = require('bluebird');
+const utils = require('../utils');
 const WebDriver = require('./webdriver');
 
 class ExtensionTestPlayer {
@@ -11,10 +11,12 @@ class ExtensionTestPlayer {
 
     onDone() {
         const END_DRIVER_TIMEOUT = 1000 * 60 * 2;
-        return this.driver.end()
-            .timeout(END_DRIVER_TIMEOUT)
-            .catch(Promise.TimeoutError, () => {
-                return this.driver.forceEnd();
+        return utils.promiseTimeout(this.driver.end(), END_DRIVER_TIMEOUT)
+            .catch((error) => {
+                if (error instanceof utils.TimeoutError) {
+                    return this.driver.forceEnd();
+                }
+                throw error;
             })
             .catch(() => {})
             .then(() => {

package/player/seleniumTestPlayer.js

@@ -22,6 +22,7 @@ const WebDriver = require('./webdriver');
 // delete after https://github.com/testimio/clickim/pull/3430 release to the store
 const CryptoJS = require('crypto-js');
 const StepActionUtils = require('./utils/stepActionUtils');
+const utils = require('../utils');
 
 class SeleniumTestPlayer {
     //eslint-disable-next-line default-param-last
@@ -83,7 +84,7 @@ class SeleniumTestPlayer {
     }
 
     onStepCompleted(result, testId, resultId, step) {
-        if (step && step.isTabOpener) {
+        if (step?.isTabOpener) {
             this.tabService.addNewPopup(this.id, step.id)
                 .catch(() => { });
         }
@@ -91,10 +92,13 @@ class SeleniumTestPlayer {
 
     onDone() {
         const END_DRIVER_TIMEOUT = 1000 * 60 * 2;
-        return this.driver.end()
-            .timeout(END_DRIVER_TIMEOUT)
-            .catch(Promise.TimeoutError, () => this.driver.forceEnd())
-            .catch(() => { })
+        return utils.promiseTimeout(this.driver.end(), END_DRIVER_TIMEOUT)
+            .catch(error => {
+                if (error instanceof utils.TimeoutError) {
+                    return this.driver.forceEnd().catch(() => null);
+                }
+                return undefined;
+            })
             .then(() => {
                 this.sessionPlayer.playbackManager.off(commonConstants.playback.RESULT, this.onStepCompleted);
                 this.sessionPlayer = null;
@@ -108,10 +112,11 @@ class SeleniumTestPlayer {
         this.tabService.clearAllTabs(this.id);
     }
 
-    addTab(openerStepId, options = { loadInfo: true }) {
-        return this.driver.getTabIds()
-            .tap(ids => this.tabService.addNewTab(this.id, ids[ids.length - 1], openerStepId, options))
-            .then(ids => this.sessionPlayer.addPlaybackFrameHandler(ids[ids.length - 1], undefined, { emptyPage: true }));
+    async addTab(openerStepId, options = { loadInfo: true }) {
+        const ids = await this.driver.getTabIds();
+        const lastId = ids.at(-1);
+        await this.tabService.addNewTab(this.id, lastId, openerStepId, options);
+        return this.sessionPlayer.addPlaybackFrameHandler(lastId, undefined, { emptyPage: true });
     }
 
     async addAllTabs(openerStepId, options = { loadInfo: true, checkForMainTab: true, takeScreenshots: true }, blackList = []) {
@@ -132,8 +137,8 @@ class SeleniumTestPlayer {
             // if we only have one tab because we removed the editor tab - we have to switchTab to one of the other tabs, otherwise
             // tabService will assume it's on a good context but it's not.
             const tabInfo = this.tabService.getMainTabInfo(this.id);
-            const utils = this.tabService.getTabUtils(this.id, tabInfo);
-            await this.tabService.switchTab(utils.tabId, this.id, { forceSwitch: true });
+            const tabUtils = this.tabService.getTabUtils(this.id, tabInfo);
+            await this.tabService.switchTab(tabUtils.tabId, this.id, { forceSwitch: true });
         }
         // deal with checkForMainTab failing due to the page refreshing or JavaScript not responding or a similar issue
         this.tabService.fixMissingMainTab(this.id);

package/player/services/tabService.js

@@ -12,6 +12,7 @@ const guid = require('../../utils').guid;
 
 const UrlUtils = sessionPlayer.urlUtils;
 const semver = require('semver');
+const utils = require('../../utils');
 
 const constants = sessionPlayer.commonConstants.stepResult;
 const tabMatcher = sessionPlayer.tabMatcher;
@@ -156,55 +157,49 @@ class TabService {
         Object.values(this.getAllTabInfos(sessionId))[0].isMain = true;
     }
 
-    buildTabInfo(sessionId, tabId, order, openerStepId, options = {}) {
-        return this.getTabDetails(tabId, sessionId, options)
-            .then(tab => {
-                const infoId = guid();
-
-                function isMainTab(tabService) {
-                    if (options.checkForMainTab) {
-                        return tab.isMainTab;
-                    }
-
-                    if (!tab.isMainTab || tab.isMainTab === 'unknown') {
-                        const missingMainTab = !tabService.getMainTabInfo(sessionId);
-                        return missingMainTab;
-                    }
-                    return tab.isMainTab;
-                }
-                this.sessionTabs[sessionId].tabInfos[tabId] = {
-                    infoId,
-                    url: tab.url,
-                    title: tab.title,
-                    favIconUrl: tab.favIconUrl,
-                    order,
-                    from: this.getTabInfo(sessionId, tab.openerTabId),
-                    isMain: isMainTab(this),
-                    openerStepId,
-                };
-
-                return infoId;
-            });
-    }
+    async buildTabInfo(sessionId, tabId, order, openerStepId, options = {}) {
+        const tab = await this.getTabDetails(tabId, sessionId, options);
+        const infoId = guid();
+        function isMainTab(tabService) {
+            if (options.checkForMainTab) {
+                return tab.isMainTab;
+            }
 
-    addTab(sessionId, id, order, openerStepId, options = {}) {
-        return this.buildTabInfo(sessionId, id, order, openerStepId, options)
-            .then(infoId => {
-                const _windowUtils = new WindowUtils(id, this.driver);
-                this._utils[infoId] = {
-                    attachDebugger: () => Promise.resolve(),
-                    detachDebugger: () => Promise.resolve(),
-                    onDebuggerDetached: () => {},
-                    tabId: id,
-                    domUtils: { getDOM: () => Promise.resolve() },
-                    windowUtils: _windowUtils,
-                    imageCaptureUtils: new ImageCaptureUtils(
-                        id,
-                        _windowUtils,
-                        new ScreenshotUtils(id, this.driver, { takeScreenshots: options.takeScreenshots })
-                    ),
-                };
-            });
+            if (!tab.isMainTab || tab.isMainTab === 'unknown') {
+                const missingMainTab = !tabService.getMainTabInfo(sessionId);
+                return missingMainTab;
+            }
+            return tab.isMainTab;
+        }
+        this.sessionTabs[sessionId].tabInfos[tabId] = {
+            infoId,
+            url: tab.url,
+            title: tab.title,
+            favIconUrl: tab.favIconUrl,
+            order,
+            from: this.getTabInfo(sessionId, tab.openerTabId),
+            isMain: isMainTab(this),
+            openerStepId,
+        };
+        return infoId;
+    }
+
+    async addTab(sessionId, id, order, openerStepId, options = {}) {
+        const infoId = await this.buildTabInfo(sessionId, id, order, openerStepId, options);
+        const _windowUtils = new WindowUtils(id, this.driver);
+        this._utils[infoId] = {
+            attachDebugger: () => Promise.resolve(),
+            detachDebugger: () => Promise.resolve(),
+            onDebuggerDetached: () => {},
+            tabId: id,
+            domUtils: { getDOM: () => Promise.resolve() },
+            windowUtils: _windowUtils,
+            imageCaptureUtils: new ImageCaptureUtils(
+                id,
+                _windowUtils,
+                new ScreenshotUtils(id, this.driver, { takeScreenshots: options.takeScreenshots })
+            ),
+        };
     }
 
     getTabUtilsByTabIdAndSessionId(sessionId, tabId) {
@@ -295,20 +290,20 @@ class TabService {
         }
 
         const infos = this.getAllTabInfos(sessionId);
-        const alltopFrameUrls = Object.keys(infos)
+        const allTopFrameUrls = Object.keys(infos)
             .map(tabId => infos[tabId].url);
 
-        if (this.exactUrlMatch(first, second, alltopFrameUrls)) {
+        if (this.exactUrlMatch(first, second, allTopFrameUrls)) {
             return true;
         }
 
         const combineDomainAndPath = urlParts => (`${urlParts.domain}/${urlParts.path.join('/')}`);
-        if (this.singleExactMatchForParts(first, second, alltopFrameUrls, combineDomainAndPath)) {
+        if (this.singleExactMatchForParts(first, second, allTopFrameUrls, combineDomainAndPath)) {
             return true;
         }
 
         const combineDomainPathAndHash = urlParts => (`${urlParts.domain}/${urlParts.path.join('/')}#${urlParts.hash}`);
-        if (this.singleExactMatchForParts(first, second, alltopFrameUrls, combineDomainPathAndHash)) {
+        if (this.singleExactMatchForParts(first, second, allTopFrameUrls, combineDomainPathAndHash)) {
             return true;
         }
 
@@ -409,32 +404,32 @@ class TabService {
             });
     }
 
-    getUnregisteredTabId(sessionId) {
-        return this.driver.getTabIds()
-            .then(ids => ids.find(tabId => !this.getAllTabIds(sessionId).includes(tabId)));
+    async getUnregisteredTabId(sessionId) {
+        const ids = await this.driver.getTabIds();
+        return ids.find(tabId => !this.getAllTabIds(sessionId).includes(tabId));
     }
 
-    waitForTabToOpen(sessionId) {
-        return this.getUnregisteredTabId(sessionId)
-            .then(newId => (newId ?
-                Promise.resolve(newId) :
-                Promise.delay(500).then(() => this.waitForTabToOpen(sessionId))));
+    async waitForTabToOpen(sessionId) {
+        const newId = await this.getUnregisteredTabId(sessionId);
+        if (newId) {
+            return newId;
+        }
+        await utils.delay(500);
+        return await this.waitForTabToOpen(sessionId);
     }
 
-    tryToAddTab(sessionId, openerStepId) {
+    async tryToAddTab(sessionId, openerStepId) {
         if (this.pendingTabs[sessionId]) {
             // don't mess with the main flow
-            return Promise.resolve();
+            return;
         }
-        return this.getUnregisteredTabId(sessionId)
-            .then(newId => {
-                if (!newId) {
-                    return Promise.resolve();
-                }
-                return this.addNewTab(sessionId, newId)
-                    .then(() => this.addFrameHandler(newId))
-                    .then(() => (this.sessionTabs[sessionId].currentTab = null));
-            });
+        const newId = await this.getUnregisteredTabId(sessionId);
+        if (!newId) {
+            return;
+        }
+        await this.addNewTab(sessionId, newId);
+        await this.addFrameHandler(newId);
+        this.sessionTabs[sessionId].currentTab = null;
     }
 
     addNewPopup(id, openerStepId) {
@@ -507,7 +502,7 @@ class TabService {
                 errorType: constants.INVALID_TEST_VERSION,
             });
         }
-        const openerStepId = (step.tabInfo || {}).openerStepId;
+        const openerStepId = step.tabInfo?.openerStepId;
         return this.waitToPendingTabs(sessionId, openerStepId)
             .then(() => {
                 let tabId;
@@ -529,10 +524,10 @@ class TabService {
 
                 if (!tabId) {
                     return this.tryToAddTab(sessionId, openerStepId)
-                        .then(() => Promise.reject(new Error('No tab ID found')));
+                        .then(() => { throw new Error('No tab ID found'); });
                 }
                 if (this.sessionTabs[sessionId].currentTab === tabId) {
-                    return Promise.resolve(tabId);
+                    return tabId;
                 }
                 return this.switchTab(tabId, sessionId)
                     .then(() => {
@@ -541,7 +536,7 @@ class TabService {
                     })
                     .catch(err => {
                         const windowClosedErrors = ['no such window', 'no window found', 'the window could not be found'];
-                        if (err.message && windowClosedErrors.find(errorString => err.message.toLowerCase().includes(errorString))) {
+                        if (err.message && windowClosedErrors.some(errorString => err.message.toLowerCase().includes(errorString))) {
                             this.sessionTabs[sessionId].tabCount--;
                             this.sessionTabs[sessionId].tabInfos[tabId].isClosed = true;
                             return this.getTabIdByTabInfo(sessionId, step);

package/player/stepActions/baseCliJsStepAction.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const _ = require('lodash');
 const BaseJsStepAction = require('./baseJsStepAction');
-const Bluebird = require('bluebird');
 const service = require('../../agent/routers/cliJsCode/service');
 const sessionPlayer = require('../../commons/getSessionPlayerRequire');
-const _ = require('lodash');
+const utils = require('../../utils');
 
 const constants = sessionPlayer.commonConstants.stepResult;
 
@@ -36,7 +36,7 @@ class BaseCliJsStepAction extends BaseJsStepAction {
         try {
             return await this.executeCliCode();
         } catch (err) {
-            if (err instanceof Bluebird.TimeoutError) {
+            if (err instanceof utils.TimeoutError) {
                 return {
                     success: false,
                     errorType: constants.ACTION_TIMEOUT,

package/player/stepActions/nodePackageStepAction.js

@@ -1,10 +1,10 @@
 'use strict';
 
 const StepAction = require('./stepAction');
-const Bluebird = require('bluebird');
 const { NpmPackageError } = require('../../errors');
 
 const service = require('../../agent/routers/cliJsCode/service');
+const utils = require('../../utils');
 
 class NodePackageStepAction extends StepAction {
     async performAction() {
@@ -29,7 +29,7 @@ class NodePackageStepAction extends StepAction {
                     message: err.message,
                 };
             }
-            if (err instanceof Bluebird.TimeoutError) {
+            if (err instanceof utils.TimeoutError) {
                 return {
                     success: false,
                     code: 'timeout',

package/player/utils/windowUtils.js

@@ -6,6 +6,7 @@ const Promise = require('bluebird');
 const pRetry = require('p-retry');
 const { delay } = require('../../utils');
 const { PageNotAvailableError } = require('../../errors');
+const utils = require('../../utils');
 const logger = require('../../commons/logger').getLogger('window-utils');
 
 class WindowUtils {
@@ -18,6 +19,7 @@ class WindowUtils {
         this.driver = driver;
     }
 
+    // Seems unused and not working since bad args to executeJS
     getElementFromPoint(x, y) {
         /* eslint-disable */
         function elementFromPoint(x, y) {
@@ -47,7 +49,7 @@ class WindowUtils {
 
     scrollToPositionWithoutAnimation(pos) {
         /* eslint-disable */
-        // if scroll behaviour is not supported, then the scrolling is not animated anyway
+        // if scroll behavior is not supported, then the scrolling is not animated anyway
         function scrollWithoutAnimation(position) {
             var scrollBehaviorSupported = 'scrollBehavior' in document.documentElement.style;
             if (scrollBehaviorSupported) {
@@ -126,15 +128,13 @@ class WindowUtils {
         return Promise.resolve();
     }
 
-    checkSize(size) {
-        return Promise.delay(1000)
-            .then(() => this.getViewportSize())
-            .then(actualSize => {
-                if (actualSize.width !== size.width || actualSize.height !== size.height) {
-                    return Promise.reject({ actualSize, expectedSize: size });
-                }
-                return { actualSize, expectedSize: size };
-            });
+    async checkSize(size) {
+        await utils.delay(1000);
+        const actualSize = await this.getViewportSize();
+        if (actualSize.width !== size.width || actualSize.height !== size.height) {
+            return Promise.reject({ actualSize, expectedSize: size });
+        }
+        return { actualSize, expectedSize: size };
     }
 
     async setViewportSize(size) {
@@ -155,12 +155,19 @@ class WindowUtils {
                 return false;
             }
 
-            return locationObj.href !== 'chrome-error://chromewebdata/' && locationObj.href !== 'safari-resource:/ErrorPage.html' && locationObj.href.indexOf('res://ieframe.dll/http_404.htm') !== 0 && locationObj.href.indexOf('ms-appx-web://microsoft.microsoftedge/assets/errorpages/') !== 0;
+            return (
+                locationObj.href !== 'chrome-error://chromewebdata/' &&
+                locationObj.href !== 'safari-resource:/ErrorPage.html' &&
+                locationObj.href.indexOf('res://ieframe.dll/http_404.htm') !== 0 &&
+                locationObj.href.indexOf('ms-appx-web://microsoft.microsoftedge/assets/errorpages/') !== 0
+            );
         }
         /* eslint-enable */
 
         const result = await this.driver.executeJS(pageIsAvailable);
-        return await (result.value ? Promise.resolve() : Promise.reject(new PageNotAvailableError()));
+        if (!result.value) {
+            throw new PageNotAvailableError('validatePageIsAvailable:PageNotAvailableError');
+        }
     }
 
     focusTab() {

package/reports/consoleReporter.js

@@ -8,6 +8,8 @@ const featureAvailabilityService = require('../commons/featureAvailabilityServic
 const { getAbortedTests, getFailedTests, getPassedTests, getFailureEvaluatingCount, getSkippedCount } = require('./reporterUtils');
 
 const colorize = { success: chalk.green, warn: chalk.yellow, error: chalk.red };
+const { CLI_MODE } = constants;
+const DEVICE = 'device';
 
 class ConsoleReporter {
     constructor(options, branchToUse) {
@@ -143,13 +145,15 @@ class ConsoleReporter {
 
     onGetSlot(workerId, browser) {
         const gridNameOrId = this.options.grid || this.options.gridId;
+        const instanceType = this.options.mode === CLI_MODE.APPIUM ? DEVICE : browser;
         if (gridNameOrId) {
-            console.log(this.toWorkerIdPrefix(workerId), `Get ${chalk.underline(browser)} slot from ${chalk.underline(gridNameOrId)}`);
+            console.log(this.toWorkerIdPrefix(workerId), `Get ${chalk.underline(instanceType)} slot from ${chalk.underline(gridNameOrId)}`);
         }
     }
 
     onGetSession(workerId, testName, mode) {
-        console.log(this.toWorkerIdPrefix(workerId), `Get browser to run ${chalk.underline(testName)}`);
+        const instanceType = mode === CLI_MODE.APPIUM ? DEVICE : 'browser';
+        console.log(this.toWorkerIdPrefix(workerId), `Get ${instanceType} to run ${chalk.underline(testName)}`);
     }
 
     onWaitToTestStart(workerId) {

package/runOptions.d.ts

@@ -109,9 +109,10 @@ interface RunnerOptions extends Partial<Omit<TunnelOptions, 'tunnelOnlyMode' | '
     retries?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20;
 
     //# region mobile flags
-    deviceModel: string;
-    deviceUdid: string;
-    osVersion: string;
+    deviceModel?: string;
+    deviceUdid?: string;
+    osVersion?: string;
+    appId?: string;
     // #endregion