@testim/testim-cli 3.269.0 → 3.271.0

package/agent/routers/cliJsCode/service.js

@@ -6,7 +6,6 @@ const path = require('path');
 const os = require('os');
 const dataUriToBuffer = require('data-uri-to-buffer');
 const { spawn: threadSpawn, config } = require('threads');
-const Promise = require('bluebird');
 const fse = require('fs-extra');
 const fs = require('fs');
 const utils = require('../../../utils');
@@ -564,13 +563,12 @@ function runCodeWithWorkerThread(
         .finally(() => thread?.terminate());
 }
 
-function removeFolder(installFolder) {
-    return new Promise(resolve => fse.remove(installFolder)
-        .then(resolve)
-        .catch(err => {
-            logger.warn('failed to remove install npm packages folder', { err });
-            return resolve();
-        }));
+async function removeFolder(installFolder) {
+    try {
+        await fse.remove(installFolder);
+    } catch (err) {
+        logger.warn('failed to remove install npm packages folder', { err });
+    }
 }
 
 function getTransactionId(stepResultId, testResultId, stepId, retryIndex) {

package/agent/server.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const Promise = require('bluebird');
 const { ArgError } = require('../errors');
 const testimCustomToken = require('../commons/testimCustomToken');
 const lazyRequire = require('../commons/lazyRequire');
@@ -111,6 +110,7 @@ function initServer({
 
         function onListening() {
             const { port } = server.address();
+            // eslint-disable-next-line no-console
             console.log(`Running on port: ${port}`);
             showStartStopOptions();
         }
@@ -128,8 +128,7 @@ function installExternalPackages({ installPlaygroundPlaywrightDeps, installPlayg
     }
 
     if (installPlaygroundSeleniumDeps) {
-        all.push(lazyRequire('selenium-webdriver'));
-        all.push(prepareChromeDriver({ projectId: project }));
+        all.push(lazyRequire('selenium-webdriver'), prepareChromeDriver({ projectId: project }));
     }
 
     return Promise.all(all);
@@ -145,6 +144,7 @@ async function showStartStopOptions() {
         message: `Type the word "stop" or Press ${sigint}.`,
         validate: x => x.toUpperCase().trim() === 'STOP',
     });
+    // eslint-disable-next-line no-console
     console.log('Exiting Testim CLI');
     process.exit(0);
 }

package/cdpTestRunner.js

@@ -1,8 +1,6 @@
 const WebSocket = require('ws');
-const Promise = require('bluebird');
 const { promiseFromCallback } = require('./utils');
 
-
 class CDPTestRunner {
     constructor() {
         this._cdpUrl = null;

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/httpRequestCounters.js

@@ -1,9 +1,10 @@
+// @ts-check
+
 'use strict';
 
 const _ = require('lodash');
 const config = require('./config');
 const dns = require('dns').promises;
-const Bluebird = require('bluebird');
 const { sum } = require('lodash');
 const { promiseMap } = require('../utils/promiseUtils');
 
@@ -59,12 +60,12 @@ module.exports.makeCounters = () => {
     }
     /**
      * @template T, TArgs
-     * @param {(...args: TArgs) => T} fn
+     * @param {(...args: TArgs[]) => T} fn
      * @param {string=} name
-     * @return {(...args: TArgs) => Bluebird<Awaited<T>>}
+     * @return {(...args: TArgs[]) => Promise<Awaited<T>>}
      */
     function wrapWithMonitoring(fn, name = fn.name) {
-        return Bluebird.method(async function (...args) {
+        return async function (...args) {
             update(counters.call, name);
             try {
                 const result = await fn.call(this, ...args);
@@ -77,7 +78,7 @@ module.exports.makeCounters = () => {
                 }
                 throw e;
             }
-        });
+        };
     }
     wrapWithMonitoring.isNetworkHealthy = async function isNetworkHealthy() {
         if (networkConnectivityTestFailed || !(await testNetworkConnectivity())) {

package/commons/npmWrapper.js

@@ -5,11 +5,11 @@ const exec = util.promisify(require('child_process').exec);
 const spawn = require('child_process').spawn;
 const path = require('path');
 const { NpmPackageError, NpmPermissionsError } = require('../errors');
-const Promise = require('bluebird');
 const fse = require('fs-extra');
 const logger = require('./logger').getLogger('cli-service');
 const { requireWithFallback } = require('./requireWithFallback');
 const fs = require('fs');
+const utils = require('../utils');
 
 async function getLatestPackageVersion(packageName) {
     const result = await exec(`npm view ${packageName} version`);
@@ -157,7 +157,7 @@ function installPackages(prefix, packageNames, proxyUri, timeoutMs) {
             try {
                 npmInstall.kill();
             } finally {
-                reject(new Promise.TimeoutError());
+                reject(new utils.TimeoutError());
             }
         }, timeoutMs);
     });

package/commons/prepareRunner.js

@@ -2,8 +2,6 @@
 
 const { CLI_MODE } = require('./constants');
 
-// @ts-ignore
-const Promise = require('bluebird');
 const os = require('os');
 const utils = require('../utils');
 const Ajv = require('ajv');
@@ -17,15 +15,10 @@ 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) {
     /**
-     * @type {globalThis.Promise<void>}
+     * @type {Promise<void>}
      */
     let chromedriverPromise = Promise.resolve();
 

package/commons/runnerFileCache.js

@@ -3,7 +3,6 @@
 'use strict';
 
 const path = require('path');
-const Promise = require('bluebird');
 const debounce = require('lodash/debounce');
 const fs = require('fs');
 const { getCliLocation } = require('../utils');
@@ -102,7 +101,7 @@ function decrypt(key, buffer) {
  * @returns {() => Promise<Awaited<T>>}
  */
 function memoize(fn, fnName, duration = THREE_HOURS, parameters = undefined) {
-    return Promise.method(async () => {
+    return async () => {
         if (!cacheEnabled) {
             return await fn();
         }
@@ -124,8 +123,9 @@ function memoize(fn, fnName, duration = THREE_HOURS, parameters = undefined) {
             await set(fnName, value, duration);
         }
         return value;
-    });
+    };
 }
+
 async function get(key) {
     const obj = await localRunnerCache;
     const valueExpiry = obj[key];

package/commons/socket/baseSocketServiceSocketIO.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const Promise = require('bluebird');
 const pRetry = require('p-retry');
 const io = require('socket.io-client');
 const config = require('../config');

package/commons/socket/remoteStepService.js

@@ -1,11 +1,10 @@
-let remoteStepServiceSocketIO; // required lazily since it takes 150ms to load
 const socketService = require('./socketService');
-
 const { socketEventTypes } = require('../constants');
+const featureFlags = require('../featureFlags');
 
 const { REMOTE_STEP_SAVED } = socketEventTypes;
-const featureFlags = require('../featureFlags');
-const Promise = require('bluebird');
+
+let remoteStepServiceSocketIO; // required lazily since it takes 150ms to load
 
 class RemoteStepService {
     init(projectId) {

package/commons/socket/remoteStepServiceSocketIO.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const Promise = require('bluebird');
 const BaseSocketService = require('./baseSocketServiceSocketIO');
 
 class RemoteStepServiceSocketIO extends BaseSocketService {

package/commons/socket/socketService.js

@@ -1,12 +1,11 @@
 'use strict';
 
 const WebSocket = require('ws');
+const _ = require('lodash');
 const { WEBSOCKET_HOST } = require('../config');
 const utils = require('../../utils');
 const logger = require('../logger').getLogger('socket-ng-service');
 const { EventEmitter } = require('events');
-const _ = require('lodash');
-const Promise = require('bluebird');
 const testimCustomToken = require('../testimCustomToken');
 
 const WAIT_BETWEEN_RECONNECT_MS = 5000;
@@ -25,13 +24,14 @@ class SocketService extends EventEmitter {
         setTimeout(() => this.connect(projectId), WAIT_BETWEEN_RECONNECT_MS);
     }
 
+    /** @param {string} url */
     formatUrl(url) {
-        if (_.startsWith(url, 'http://')) {
-            return _.replace(url, 'http://', 'ws://');
+        if (url.startsWith('http://')) {
+            return url.replace('http://', 'ws://');
         }
 
-        if (_.startsWith(url, 'https://')) {
-            return _.replace(url, 'https://', 'wss://');
+        if (url.startsWith('https://')) {
+            return url.replace('https://', 'wss://');
         }
 
         return url;

package/commons/socket/testResultServiceSocketIO.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const Promise = require('bluebird');
 const BaseSocketService = require('./baseSocketServiceSocketIO');
 
 class TestResultServiceSocketIO extends BaseSocketService {

package/commons/testimCustomToken.js

@@ -119,7 +119,7 @@ function getTokenV3UserData() {
 }
 
 module.exports = {
-    init: Promise.method(init),
+    init,
     initFromData,
     getCustomTokenV3,
     getTokenV3UserData,

package/commons/testimDesiredCapabilitiesBuilder.js

@@ -582,6 +582,7 @@ function buildAppiumOptions({ projectType, gridInfo, testRunConfig, nativeApp, o
     let appCaps = {
         'headspin:capture': true,
         'appium:autoAcceptAlerts': true,
+        'appium:noReset': true,
     };
     switch (projectType) {
         case 'ios':

package/commons/testimServicesApi.js

@@ -5,7 +5,6 @@ const pRetry = require('p-retry');
 const _ = require('lodash');
 const testimCustomToken = require('./testimCustomToken');
 const constants = require('./constants');
-const Promise = require('bluebird');
 const utils = require('../utils');
 const config = require('./config');
 const httpRequest = require('./httpRequest');
@@ -214,7 +213,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 +233,7 @@ function getSuiteTestList({
             testConfigIds,
             intersections,
         },
-    }), { retries: DEFAULT_REQUEST_RETRY });
+    }), { retries: DEFAULT_REQUEST_RETRY, factor: 1 });
 }
 
 async function getAppDetails({ appId, projectId }) {
@@ -298,7 +297,7 @@ function getGridById(companyId, projectId, gridId, browser, executionId) {
 
 /**
  * @param {{ projectId: string; token: string; branchName: string; lightweightMode?: import('../runOptions').LightweightSettings; localGrid: boolean; }} param0
- * @returns {globalThis.Promise<{
+ * @returns {Promise<{
  *  authData: { token: string; refreshToken: string; uid: string; ngrokToken?: string; isNgrokWhitelisted?: boolean; };
  *  editorConfig: { editorUrl: string };
  *  companyByProjectId: Awaited<ReturnType<import('services/src/company/companyService')['getCompanyByProjectIdUsingCache']>>;
@@ -580,7 +579,7 @@ module.exports = {
     getEditorUrl,
     getLabFeaturesByProjectId,
     uploadRunDataArtifact,
-    updateTestDataArtifact: Promise.method(updateTestDataArtifact),
+    updateTestDataArtifact,
     initializeUserWithAuth,
     addTestRetry,
     getHybridGridProvider,

package/coverage/jsCoverage.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const servicesApi = require('../commons/testimServicesApi');
-const Promise = require('bluebird');
 const fs = require('fs');
 const fsPromises = require('fs/promises');
 const path = require('path');

package/credentialsManager.js

@@ -2,7 +2,6 @@
 
 const fse = require('fs-extra');
 const path = require('path');
-const Promise = require('bluebird');
 const YAML = require('yaml');
 const os = require('os');
 const utils = require('./utils');
@@ -24,10 +23,12 @@ function timeout(promise, ms) {
 async function getCredentialsFromChrome() {
     const app = require('express')();
     const loginInfoFromChrome = (async function waitForChromeToSendData() {
-        return timeout(new Promise(resolve => app.get('/loginInfo', (req, res) => {
-            resolve(JSON.parse(Buffer.from(req.query.info, 'base64').toString()));
-            res.status(200).end();
-        })), 60000).catch(() => null);
+        return timeout(new Promise(resolve => {
+            app.get('/loginInfo', (req, res) => {
+                resolve(JSON.parse(Buffer.from(req.query.info, 'base64').toString()));
+                res.status(200).end();
+            });
+        }), 60000).catch(() => null);
     }());
     await new Promise((resolve, reject) => {
         const server = app.listen(42543, (err) => {
@@ -71,7 +72,7 @@ async function doLogin({ overwriteExisting = true, projects = null } = {}) {
     const spinner = ora('Getting credentials from Testim extension ...').start();
 
     if (!projects) {
-        projects = await timeout(Promise.resolve(getCredentialsFromChrome()), 62000).catch(e => null);
+        projects = await timeout(Promise.resolve(getCredentialsFromChrome()), 62000).catch(() => null);
     }
 
     if (projects?.token) { // V1(legacy) of the login extension API