@testim/testim-cli 3.268.0 → 3.270.0

package/agent/routers/cliJsCode/service.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 'use strict';
 
 const path = require('path');
@@ -5,7 +7,8 @@ const os = require('os');
 const dataUriToBuffer = require('data-uri-to-buffer');
 const { spawn: threadSpawn, config } = require('threads');
 const Promise = require('bluebird');
-const fs = require('fs-extra');
+const fse = require('fs-extra');
+const fs = require('fs');
 const utils = require('../../../utils');
 const logger = require('../../../commons/logger').getLogger('cli-service');
 const { getS3Artifact } = require('../../../commons/testimServicesApi');
@@ -13,6 +16,7 @@ const npmWrapper = require('../../../commons/npmWrapper');
 const featureFlags = require('../../../commons/featureFlags');
 const { TimeoutError } = require('../../../errors');
 
+/** @type {import('worker_threads') | false} */
 let workerThreads;
 
 config.set({
@@ -32,6 +36,15 @@ function convertWindowsBackslash(input) {
     return input.replace(/\\/g, '/');
 }
 
+/**
+ * @param {string} transactionId
+ * @param {any} incomingParams
+ * @param {any} context
+ * @param {any} code
+ * @param {Record<string, any>} packageLocalLocations
+ * @param {number=} timeout
+ * @param {string=} fileDataUrl
+ */
 function runCode(transactionId, incomingParams, context, code, packageLocalLocations = {}, timeout = undefined, fileDataUrl = undefined) {
     const requireCode = Object.keys(packageLocalLocations).reduce((all, pMember) => {
         all += `
@@ -204,7 +217,7 @@ function runCode(transactionId, incomingParams, context, code, packageLocalLocat
 
     const testimConsoleLogDataAggregates = [];
     const thread = threadSpawn(constructWithArguments(Function, ['input', 'done', 'progress', runFn]));
-    return new Promise((resolve) => {
+    return utils.promiseTimeout(new Promise((resolve) => {
         thread
             .send({ incomingParams, context, code })
             .on('message', message => {
@@ -226,7 +239,7 @@ function runCode(transactionId, incomingParams, context, code, packageLocalLocat
                     tstConsoleLogs: testimConsoleLogDataAggregates,
                     status: 'failed',
                     result: {
-                        resultValue: err && err.toString(),
+                        resultValue: err?.toString(),
                         exports: {},
                         exportsTest: {},
                         exportsGlobal: {},
@@ -237,22 +250,25 @@ function runCode(transactionId, incomingParams, context, code, packageLocalLocat
             .on('exit', () => {
                 logger.debug('Run code worker has been terminated', { transactionId });
             });
-    }).timeout(timeout)
-        .catch(Promise.TimeoutError, err => {
+    }), timeout)
+        .catch(err => {
+            if (!(err instanceof utils.TimeoutError)) {
+                throw err;
+            }
             logger.warn('timeout to run code', { transactionId, err });
-            return Promise.resolve({
+            return {
                 tstConsoleLogs: testimConsoleLogDataAggregates,
                 status: 'failed',
                 result: {
-                    resultValue: err && err.toString(),
+                    resultValue: err?.toString(),
                     exports: {},
                     exportsTest: {},
                     exportsGlobal: {},
                 },
                 success: false,
-            });
+            };
         })
-        .finally(() => thread && thread.kill());
+        .finally(() => thread?.kill());
 }
 
 function requireOrImportMethod(path) {
@@ -260,7 +276,6 @@ function requireOrImportMethod(path) {
         return { sync: true, lib: require(path) };
     } catch (err) {
         if (err.code === 'ERR_REQUIRE_ESM') {
-            const fs = require('fs');
             const pathModule = require('path');
 
             const lib = fs.promises.readFile(`${path}${pathModule.sep}package.json`).then(file => {
@@ -275,7 +290,22 @@ function requireOrImportMethod(path) {
     }
 }
 
-function runCodeWithWorkerThread(transactionId, incomingParams, context, code, packageLocalLocations = {}, timeout = undefined, fileDataUrl = undefined) {
+/**
+ * @param {string} transactionId
+ * @param {any} incomingParams
+ * @param {any} context
+ * @param {any} code
+ * @param {number=} timeout
+ */
+function runCodeWithWorkerThread(
+    transactionId,
+    incomingParams,
+    context,
+    code,
+    packageLocalLocations = {},
+    timeout = undefined,
+    fileDataUrl = undefined,
+) {
     // technically shouldn't happen, but better safe than sorry.
     if (!workerThreads) {
         workerThreads = require('worker_threads');
@@ -477,7 +507,7 @@ function runCodeWithWorkerThread(transactionId, incomingParams, context, code, p
     const thread = new Worker(runFn, {
         eval: true,
     });
-    return new Promise((resolve) => {
+    return utils.promiseTimeout(new Promise((resolve) => {
         thread
             .on('message', message => {
                 if (message.action === 'finish') {
@@ -500,7 +530,7 @@ function runCodeWithWorkerThread(transactionId, incomingParams, context, code, p
                     tstConsoleLogs: testimConsoleLogDataAggregates,
                     status: 'failed',
                     result: {
-                        resultValue: err && err.toString(),
+                        resultValue: err?.toString(),
                         exports: {},
                         exportsTest: {},
                         exportsGlobal: {},
@@ -513,26 +543,29 @@ function runCodeWithWorkerThread(transactionId, incomingParams, context, code, p
             });
         // context can contain methods and proxies which cannot pass.
         thread.postMessage({ incomingParams, context: JSON.parse(JSON.stringify(context)), code });
-    }).timeout(timeout)
-        .catch(Promise.TimeoutError, err => {
+    }), timeout)
+        .catch(err => {
+            if (!(err instanceof utils.TimeoutError)) {
+                throw err;
+            }
             logger.warn('timeout to run code', { transactionId, err });
-            return Promise.resolve({
+            return {
                 tstConsoleLogs: testimConsoleLogDataAggregates,
                 status: 'failed',
                 result: {
-                    resultValue: err && err.toString(),
+                    resultValue: err?.toString(),
                     exports: {},
                     exportsTest: {},
                     exportsGlobal: {},
                 },
                 success: false,
-            });
+            };
         })
-        .finally(() => thread && thread.terminate());
+        .finally(() => thread?.terminate());
 }
 
 function removeFolder(installFolder) {
-    return new Promise(resolve => fs.remove(installFolder)
+    return new Promise(resolve => fse.remove(installFolder)
         .then(resolve)
         .catch(err => {
             logger.warn('failed to remove install npm packages folder', { err });

package/bluebirdConfig.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 /**
  * Configure bluebird promises
@@ -6,18 +6,19 @@
 const Promise = require('bluebird');
 const { isDebuggerConnected } = require('./commons/detectDebugger');
 const { OVERRIDE_TIMEOUTS } = require('./commons/config');
+
 Promise.config({
     // Disable warnings.
     warnings: false,
     // Enable long stack traces.
     longStackTraces: Boolean(isDebuggerConnected()),
     // Disable cancellation.
-    cancellation: false
+    cancellation: false,
 });
 
 let warnedAboutDebugger = false;
 if (OVERRIDE_TIMEOUTS) {
-    let old = Promise.prototype.timeout;
+    const old = Promise.prototype.timeout;
     const timeoutOverride = Number(OVERRIDE_TIMEOUTS || 6e5);
     if (!OVERRIDE_TIMEOUTS && !warnedAboutDebugger) {
         warnedAboutDebugger = true;
@@ -31,7 +32,7 @@ if (OVERRIDE_TIMEOUTS) {
 if (process.env.IS_BLUEBIRD_NATIVE_PROMISE_SCHEDULER) {
     // If the debugger is connected we skip the trampoline in order to schedule with native promise scheduling
     // which makes the V8 debugger aware of promise scheduling and makes async stack traces work without a lot of unnecessary bluebird-specific frames.
-    const NativePromise = (async function () {})().constructor;
+    const NativePromise = (async function () {}()).constructor;
     const ResolvedNativePromise = NativePromise.resolve();
     Promise.setScheduler(fn => ResolvedNativePromise.then(fn));
 }

package/cliAgentMode.js

@@ -90,15 +90,6 @@ async function runAgentMode(options) {
     );
 }
 
-async function hackForCoralogixAndXhr() {
-    Promise.resolve().then(() => {
-        // @ts-ignore
-        global.xhr2 = require('./commons/xhr2'); // this is inside a `then` to not block and let network requests start
-    });
-
-    // this gets picked up later in sessionPlayerInit
-}
-
 let startedWithStart = false;
 
 function getStartedWithStart() {
@@ -179,7 +170,6 @@ async function startTestimStandaloneBrowser(options) {
 
     let shouldDownloadExtension = !(options.ext || options.extensionPath);
 
-    await hackForCoralogixAndXhr();
     if (shouldDownloadExtension && await fs.pathExists(downloadedExtensionPath)) {
         const stat = await fs.stat(downloadedExtensionPath);
         shouldDownloadExtension = (Date.now() - EXTENSION_CACHE_TIME > stat.mtimeMs);

package/commons/httpRequest.js

@@ -2,8 +2,8 @@
 
 const logger = require('./logger').getLogger('http-request');
 const superagent = require('superagent');
-const Promise = require('bluebird');
 const { makeCounters } = require('./httpRequestCounters');
+const { promiseFromCallback } = require('../utils/promiseUtils');
 
 const wrapWithMonitoring = makeCounters();
 
@@ -63,7 +63,7 @@ function deleteFullRes(url, body = {}, headers = {}, timeout = DEFAULT_REQUEST_T
         request.proxy(getProxy());
     }
 
-    return Promise.fromCallback((callback) => request.end(callback));
+    return promiseFromCallback((callback) => request.end(callback));
 }
 
 function post({
@@ -98,7 +98,7 @@ function postFullRes(url, body, headers = {}, timeout = DEFAULT_REQUEST_TIMEOUT,
         request.retry(retry);
     }
 
-    return Promise.fromCallback((callback) => request.end(callback)).catch(e => e, e => {
+    return promiseFromCallback((callback) => request.end(callback)).catch(e => e, e => {
         e.url = url;
         e.originalRequestTimeout = timeout;
         e.additionalSetHeaders = headers;
@@ -127,7 +127,7 @@ function postForm(url, fields, files, headers = {}, timeout = DEFAULT_REQUEST_TI
         request.proxy(getProxy());
     }
 
-    return Promise.fromCallback((callback) => request.end(callback))
+    return promiseFromCallback((callback) => request.end(callback))
         .then((res) => {
             if (res.type === 'text/plain') {
                 return res.text;
@@ -156,7 +156,7 @@ function _get(url, query, headers = {}, timeout = DEFAULT_REQUEST_TIMEOUT, { isB
         request.proxy(getProxy());
     }
 
-    return Promise.fromCallback((callback) => request.end(callback));
+    return promiseFromCallback((callback) => request.end(callback));
 }
 
 function getText(url, query, headers) {
@@ -191,7 +191,7 @@ function head(url) {
         request.proxy(getProxy());
     }
 
-    return Promise.fromCallback((callback) => request.end(callback))
+    return promiseFromCallback((callback) => request.end(callback))
         .catch(logErrorAndRethrow('failed to head request', { url }));
 }
 
@@ -210,7 +210,7 @@ function put(url, body, headers = {}, timeout = DEFAULT_REQUEST_TIMEOUT) {
         request.proxy(getProxy());
     }
 
-    return Promise.fromCallback((callback) => request.end(callback))
+    return promiseFromCallback((callback) => request.end(callback))
         .then((res) => res.body)
         .catch(logErrorAndRethrow('failed to put request', { url }));
 }
@@ -236,7 +236,7 @@ function download(url) {
         request.proxy(getProxy());
     }
 
-    return Promise.fromCallback((callback) => request.end(callback))
+    return promiseFromCallback((callback) => request.end(callback))
         .then(response => {
             logger.info('finished to download', { url });
             return response;

package/commons/prepareRunner.js

@@ -17,11 +17,6 @@ const PREPARE_MOCK_NETWORK_ERROR_PREFIX = 'JSON file supplied to --mock-network-
 
 const logger = require('./logger').getLogger('prepare runner');
 
-Promise.resolve().then(() => {
-    // @ts-ignore
-    global.xhr2 = require('./xhr2'); // this is inside a `then` to not block and let network requests start
-});
-
 /** @param {import('../runOptions').RunnerOptions} options */
 async function prepare(options) {
     /**

package/commons/runnerFileCache.js

@@ -1,13 +1,16 @@
+// @ts-check
+
 'use strict';
 
 const path = require('path');
 const Promise = require('bluebird');
 const debounce = require('lodash/debounce');
-const fs = Promise.promisifyAll(require('fs'));
+const fs = require('fs');
 const { getCliLocation } = require('../utils');
 
 const logger = require('./logger').getLogger('local cache');
 const crypto = require('crypto');
+const utils = require('../utils');
 
 let cacheLocation = path.resolve(getCliLocation(), 'testim-cache');
 
@@ -25,10 +28,19 @@ const THREE_HOURS = 1000 * 60 * 60 * 3;
 
 const getCacheFileLocation = () => path.resolve(path.resolve(cacheLocation, 'testim.cache'));
 
-const getLocalRunnerCache = () => fs.readFileAsync(getCacheFileLocation()).then(async buffer => {
-    const key = await _encryptKeyPromise;
-    return decrypt(key, buffer);
-}).timeout(30000).catch(() => ({}));
+async function getLocalRunnerCache() {
+    try {
+        return await utils.promiseTimeout(
+            fs.promises.readFile(getCacheFileLocation()).then(async buffer => {
+                const key = await _encryptKeyPromise;
+                return decrypt(key, buffer);
+            }),
+            30_000,
+        );
+    } catch {
+        return {};
+    }
+}
 
 let localRunnerCache = getLocalRunnerCache();
 
@@ -59,7 +71,7 @@ const encryptAndSave = debounce(async (object) => {
         if (!pathExists) {
             await fs.promises.mkdir(cacheLocation, { recursive: true });
         }
-        await fs.writeFileAsync(getCacheFileLocation(), result);
+        await fs.promises.writeFile(getCacheFileLocation(), result);
     } catch (err) {
         logger.error('failed saving cache', { err });
         error = err;
@@ -77,6 +89,7 @@ function decrypt(key, buffer) {
     const keyBuffer = Buffer.from(key);
     const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.concat([keyBuffer, Buffer.alloc(32)], 32), iv);
     const decrypted = decipher.update(encryptedText);
+    // @ts-ignore
     return JSON.parse(Buffer.concat([decrypted, decipher.final()]));
 }
 /**

package/commons/testimDesiredCapabilitiesBuilder.js

@@ -561,7 +561,7 @@ function buildSeleniumOptions(browserOptions, testName, testRunConfig, gridInfo,
 }
 
 //testRunConfig not in used for now
-function buildAppiumOptions({ projectType, gridInfo, testRunConfig, nativeApp, options, appPath }) {
+function buildAppiumOptions({ projectType, gridInfo, testRunConfig, nativeApp, options, appPath, androidActivityWait }) {
     const { deviceModel, osVersion, deviceUdid } = options;
     const headspinSelector = {};
 
@@ -576,10 +576,13 @@ function buildAppiumOptions({ projectType, gridInfo, testRunConfig, nativeApp, o
         hostname: gridInfo.host,
         port: gridInfo.port,
         path: `/v0/${gridInfo.accessToken}/wd/hub`,
+        // connectionRetryTimeout: 900000, -- not used for now
     };
-
+    //TODO: check if more caps should be defined as default
     let appCaps = {
         'headspin:capture': true,
+        'appium:autoAcceptAlerts': true,
+        'appium:noReset': true,
     };
     switch (projectType) {
         case 'ios':
@@ -588,7 +591,9 @@ function buildAppiumOptions({ projectType, gridInfo, testRunConfig, nativeApp, o
                 platformName: 'iOS',
                 'appium:automationName': 'XCUITest',
                 ...(nativeApp && { 'appium:bundleId': nativeApp.id }),
-                ...(appPath && { 'appium:app': appPath }),
+                ...(appPath && {
+                    'appium:app': appPath,
+                }),
             };
             break;
         case 'android':
@@ -596,11 +601,14 @@ function buildAppiumOptions({ projectType, gridInfo, testRunConfig, nativeApp, o
                 ...appCaps,
                 platformName: 'Android',
                 'appium:automationName': 'UiAutomator2',
+                'appium:appWaitActivity': androidActivityWait,
                 ...(nativeApp && {
-                    'appium:appPackage': nativeApp.packageName,
+                    'appium:appPackage': nativeApp.id || nativeApp.packageName,
                     'appium:appActivity': nativeApp.activity,
                 }),
-                ...(appPath && { 'appium:app': appPath }),
+                ...(appPath && {
+                    'appium:app': appPath,
+                }),
             };
             break;
         default:

package/commons/testimServicesApi.js

@@ -214,7 +214,7 @@ async function getTestPlanTestList(projectId, names, planIds, branch, intersecti
  *   testConfigIds?: string[];
  *   intersections: import('../runOptions').RunnerOptions['intersections'];
  * }} param0
- * @returns {import('services/src/suite/service').RunListResult}
+ * @returns {Promise<import('services/src/suite/service').RunListResult>}
  */
 function getSuiteTestList({
     projectId, labels, testIds, testNames, testConfigNames, suiteNames, suiteIds, branch, rerunFailedByRunId, testConfigIds, intersections,
@@ -234,7 +234,7 @@ function getSuiteTestList({
             testConfigIds,
             intersections,
         },
-    }), { retries: DEFAULT_REQUEST_RETRY });
+    }), { retries: DEFAULT_REQUEST_RETRY, factor: 1 });
 }
 
 async function getAppDetails({ appId, projectId }) {

package/credentialsManager.js

@@ -5,6 +5,7 @@ const path = require('path');
 const Promise = require('bluebird');
 const YAML = require('yaml');
 const os = require('os');
+const utils = require('./utils');
 const { launchChrome } = require('./commons/chrome-launcher');
 
 async function getProjectId() {
@@ -17,7 +18,7 @@ async function getToken() {
 
 function timeout(promise, ms) {
     // we need this to time out even if we disabled timeouts system wide
-    return Promise.race([promise, Promise.delay(ms).then(() => { throw new Promise.TimeoutError('timeout'); })]);
+    return Promise.race([promise, utils.delay(ms).then(() => { throw new utils.TimeoutError('timeout'); })]);
 }
 
 async function getCredentialsFromChrome() {
@@ -73,14 +74,14 @@ async function doLogin({ overwriteExisting = true, projects = null } = {}) {
         projects = await timeout(Promise.resolve(getCredentialsFromChrome()), 62000).catch(e => null);
     }
 
-    if (projects && projects.token) { // V1(legacy) of the login extension API
+    if (projects?.token) { // V1(legacy) of the login extension API
         credentials.token = projects.token;
         credentials.projectId = projects.projectId;
         spinner.succeed();
 
         await writeCredentials(testimCredentialsFile, credentials);
         return;
-    } if (projects && projects.length) { // V2(current) of the login extension API
+    } if (projects?.length) { // V2(current) of the login extension API
         spinner.succeed();
 
         const response = projects.length === 1 ?

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.268.0",
+  "version": "3.270.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@testim/testim-cli",
-      "version": "3.268.0",
+      "version": "3.270.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.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-      "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+      "version": "18.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
     },
     "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.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-      "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+      "version": "18.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
     },
     "node_modules/devtools/node_modules/ua-parser-js": {
       "version": "1.0.32",
@@ -15468,9 +15468,9 @@
       }
     },
     "node_modules/webdriver/node_modules/@types/node": {
-      "version": "18.11.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-      "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+      "version": "18.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
     },
     "node_modules/webdriverio": {
       "version": "7.24.0",
@@ -15510,9 +15510,9 @@
       }
     },
     "node_modules/webdriverio/node_modules/@types/node": {
-      "version": "18.11.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-      "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+      "version": "18.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
     },
     "node_modules/webdriverio/node_modules/brace-expansion": {
       "version": "2.0.1",
@@ -17129,9 +17129,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.13",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-          "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+          "version": "18.11.17",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+          "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
         }
       }
     },
@@ -19496,9 +19496,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.13",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-          "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+          "version": "18.11.17",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+          "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
         },
         "ua-parser-js": {
           "version": "1.0.32",
@@ -27994,9 +27994,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.13",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-          "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+          "version": "18.11.17",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+          "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
         }
       }
     },
@@ -28035,9 +28035,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "18.11.13",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.13.tgz",
-          "integrity": "sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w=="
+          "version": "18.11.17",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+          "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
         },
         "brace-expansion": {
           "version": "2.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.268.0",
+  "version": "3.270.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/polyfills/index.js

@@ -1 +1,5 @@
 require('./Array.prototype.at');
+const xhr2 = require('../commons/xhr2');
+
+global.xhr2 = xhr2;
+global.XMLHttpRequest = xhr2;

package/runners/TestPlanRunner.js

@@ -358,7 +358,7 @@ class TestPlanRunner {
         const suiteResult = await getSuite(options, branchToUse);
         perf.log('after getSuite');
 
-        if (!suiteResult.tests[0]?.length) {
+        if (!suiteResult?.tests[0]?.length) {
             if (options.rerunFailedByRunId) {
                 throw new ArgError('No failed tests found in the provided run');
             }

package/runners/runnerUtils.js

@@ -10,7 +10,6 @@ const { ArgError } = require('../errors');
 /**
  * @param {import('../runOptions').RunnerOptions} options
  * @param {string} branchToUse
- * @returns
  */
 async function getSuite(options, branchToUse) {
     if (options.lightweightMode?.onlyTestIdsNoSuite && options.testId) {

package/stepPlayers/nodePackageStepPlayback.js

@@ -1,24 +1,28 @@
-"use strict";
+'use strict';
 
 const service = require('../agent/routers/cliJsCode/service');
-const Promise = require('bluebird');
-const {NpmPackageError} = require('../errors');
+const { NpmPackageError } = require('../errors');
+const utils = require('../utils');
 
-module.exports.run = (browser, step) => {
-    const {stepId, testResultId, retryIndex, stepResultId, packageData, timeout} = step.data;
-    return service.installPackage(stepId, testResultId, retryIndex, packageData, stepResultId, timeout)
-        .then(data => ({data, success: true}))
-        .catch(NpmPackageError, err => {
+module.exports.run = async (browser, step) => {
+    const { stepId, testResultId, retryIndex, stepResultId, packageData, timeout } = step.data;
+    try {
+        const data = await service.installPackage(stepId, testResultId, retryIndex, packageData, stepResultId, timeout);
+        return { data, success: true };
+    } catch (err) {
+        if (err instanceof NpmPackageError) {
             return {
                 success: false,
-                code: "invalid-node-package",
-                message: err.message
+                code: 'invalid-node-package',
+                message: err.message,
             };
-        })
-        .catch(Promise.TimeoutError, () => {
+        }
+        if (err instanceof utils.TimeoutError) {
             return {
                 success: false,
-                code: "timeout"
+                code: 'timeout',
             };
-        });
+        }
+        throw err;
+    }
 };

package/testRunHandler.js

@@ -98,6 +98,20 @@ class TestRun {
         return this._executionName;
     }
 
+    get androidActivityWait() {
+        const activity = 'appMetadata' in this._nativeApp ? this._nativeApp.appMetadata.activity : this._nativeApp.activity;
+        const lastValue = activity.split('.').pop();
+        return activity.replace(lastValue, '*');
+    }
+
+    get nativeAppLink() {
+        let link = null;
+        if ('filePath' in this._nativeApp) {
+            link = `${config.SERVICES_HOST}/storage${this._nativeApp.filePath}?access_token=${this._options.authData.token}`;
+        }
+        return link;
+    }
+
     async getNativeAppData() {
         const { appId, baseUrl } = this._options;
         if (baseUrl && !this._nativeApp && !appId) {
@@ -112,6 +126,9 @@ class TestRun {
             };
         }
         if (this._nativeApp && !appId) {
+            if ('appMetadata' in this._nativeApp) {
+                return this._nativeApp.appMetadata;
+            }
             return this._nativeApp;
         }
         return null;

package/testimNpmDriver.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /* eslint-disable no-console */
 const semver = require('semver');
 const config = require('./commons/config');
@@ -32,7 +34,7 @@ async function checkNpmVersion() {
         return;
     }
     try {
-        const latestVersion = await utils.promiseTimeout(getNpmVersion('@testim/testim-cli'), 5000, 'The API call to NPM timed out');
+        const latestVersion = await utils.promiseTimeout(getNpmVersion(), 5000, 'The API call to NPM timed out');
         const packVersion = getPackageVersion();
         if (packVersion && semver.lt(packVersion, latestVersion)) {
             console.log(chalk.yellow(

package/utils/promiseUtils.js

@@ -87,4 +87,5 @@ module.exports = {
     promiseTimeout,
     promiseMap,
     promiseFromCallback,
+    TimeoutError,
 };

package/workers/WorkerAppium.js

@@ -31,7 +31,10 @@ class WorkerAppium extends BaseWorker {
     async getBrowserOnce(testRunHandler, customExtensionLocalLocation, appiumTestPlayer, gridInfo) {
         reporter.onGetSession(this.id, this.testName, testRunHandler.runMode);
         const { driver } = appiumTestPlayer;
-        let appPath = null;
+        const projectType = this.options.projectData.type;
+        const nativeApp = await testRunHandler.getNativeAppData();
+        const androidActivityWait = projectType === 'android' ? testRunHandler.androidActivityWait : null;
+        let appPath = testRunHandler.nativeAppLink;
         if (this.options.appId) {
             const { project: projectId, appId } = this.options;
             const mobileApp = await testimServicesApi.getAppDetails({ appId, projectId });
@@ -41,10 +44,17 @@ class WorkerAppium extends BaseWorker {
             }
             appPath = `${config.SERVICES_HOST}/storage${mobileApp.filePath}?access_token=${this.options.authData.token}`;
         }
-        const nativeApp = await testRunHandler.getNativeAppData();
-        const projectType = this.options.projectData.type;
         try {
-            const capabilities = desiredCapabilitiesBuilder.buildAppiumOptions({ projectType, gridInfo, testRunConfig: this.testRunConfig, nativeApp, options: this.options, appPath });
+            const capabilities = desiredCapabilitiesBuilder.buildAppiumOptions({
+                projectType,
+                gridInfo,
+                testRunConfig: this.testRunConfig,
+                nativeApp,
+                options: this.options,
+                appPath,
+                androidActivityWait,
+            });
+
             const activeSession = await driver.remote(capabilities);
             driver.activeSession = activeSession;
             await this.updateDeviceInfo(testRunHandler, activeSession);

package/workers/WorkerSelenium.js

@@ -1,9 +1,6 @@
 'use strict';
 
 const Promise = require('bluebird');
-
-const { timeoutMessages } = require('../commons/constants');
-const { PageNotAvailableError } = require('../errors');
 const BaseWorker = require('./BaseWorker');
 const logger = require('../commons/logger').getLogger('worker-selenium');
 const reporter = require('../reports/reporter');
@@ -11,6 +8,9 @@ const SeleniumTestPlayer = require('../player/seleniumTestPlayer');
 const WindowUtils = require('../player/utils/windowUtils');
 const sessionPlayerInit = require('../commons/getSessionPlayerRequire');
 const perf = require('../commons/performance-logger');
+const utils = require('../utils');
+const { timeoutMessages } = require('../commons/constants');
+const { PageNotAvailableError } = require('../errors');
 const { preloadTests } = require('../commons/preloadTests');
 
 // this navigation timeout is handled from outside the worker, so don't pass a small timeout to navigate
@@ -147,9 +147,9 @@ class WorkerSelenium extends BaseWorker {
                 ).catch(reject))
                     .log('right after playTestByCode')
                     .timeout(this.testRunTimeout, timeoutMessages.TEST_COMPLETE_TIMEOUT_MSG)
-                    .catch(Promise.TimeoutError, err => {
-                        if (sessionPlayer.stopPlayingOnTestTimeout) {
-                            sessionPlayer.stopPlayingOnTestTimeout();
+                    .catch(err => {
+                        if (err instanceof utils.TimeoutError) {
+                            sessionPlayer.stopPlayingOnTestTimeout?.();
                         }
                         throw err;
                     })
@@ -179,9 +179,9 @@ class WorkerSelenium extends BaseWorker {
                     preloadedTest
                 ).catch(reject))
                 .timeout(this.testRunTimeout, timeoutMessages.TEST_COMPLETE_TIMEOUT_MSG)
-                .catch(Promise.TimeoutError, err => {
-                    if (sessionPlayer.stopPlayingOnTestTimeout) {
-                        sessionPlayer.stopPlayingOnTestTimeout();
+                .catch(err => {
+                    if (err instanceof utils.TimeoutError) {
+                        sessionPlayer.stopPlayingOnTestTimeout?.();
                     }
                     throw err;
                 })