@testim/testim-cli 3.279.0 → 3.281.0

package/commons/testimServicesApi.js

@@ -562,11 +562,11 @@ function updateRemoteRunFailure(body) {
  * @return {Promise<Array[import('../../../services/src/grid/mobileGridService').MobileDevice] | null>}
  */
 
-async function getMobileDevicesFromGrid({ projectType, gridId, companyId, selectors }) {
+async function getMobileDevicesFromGrid({ projectId, projectType, gridId, companyId, selectors }) {
     let url = `${GRID_PATH}/mobileDevices/${gridId}/${companyId}?projectType=${projectType}`;
     url = selectors ? `${url}&selectors=${encodeURIComponent(selectors)}` : url;
     try {
-        return pRetry(() => getWithAuth({ url }), { retries: DEFAULT_REQUEST_RETRY });
+        return pRetry(() => getWithAuth(url, { projectId }), { retries: DEFAULT_REQUEST_RETRY });
     } catch (err) {
         logger.warn('could\'nt get devices from headspin grid.', { err });
         return null;

package/errors.js

@@ -75,6 +75,13 @@ class GridError extends Error {
     }
 }
 
+class GridConcurrencyError extends GridError {
+    constructor(message) {
+        super(message);
+        this.name = 'GridConcurrencyError';
+    }
+}
+
 /**
  * NpmPackageError
  *
@@ -141,6 +148,7 @@ module.exports = {
     GetBrowserError,
     PageNotAvailableError,
     GridError,
+    GridConcurrencyError,
     QuotaDepletedError,
     NpmPackageError,
     NpmPermissionsError,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.279.0",
+  "version": "3.281.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@testim/testim-cli",
-      "version": "3.279.0",
+      "version": "3.281.0",
       "license": "Proprietary",
       "dependencies": {
         "@applitools/eyes-sdk-core": "13.11.21",
@@ -86,7 +86,6 @@
         "gulp-preprocess": "3.0.3",
         "merge-stream": "2.0.0",
         "proxyquire": "2.1.3",
-        "request-micro": "2.0.1",
         "sinon": "9.0.2",
         "sinon-chai": "3.7.0",
         "ts-node": "9.1.1",
@@ -12843,12 +12842,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/request-micro": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/request-micro/-/request-micro-2.0.1.tgz",
-      "integrity": "sha512-4K8hyAbUW9tK+j6E8ITnPG2GM9KEjrMO1wYQx6gq/1x0H53Id3gGdPCMFjtDy42I7/cn9nxe8J1jaFWCENdAXg==",
-      "dev": true
-    },
     "node_modules/request-promise-core": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
@@ -25700,12 +25693,6 @@
         }
       }
     },
-    "request-micro": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/request-micro/-/request-micro-2.0.1.tgz",
-      "integrity": "sha512-4K8hyAbUW9tK+j6E8ITnPG2GM9KEjrMO1wYQx6gq/1x0H53Id3gGdPCMFjtDy42I7/cn9nxe8J1jaFWCENdAXg==",
-      "dev": true
-    },
     "request-promise-core": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.279.0",
+  "version": "3.281.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{
@@ -22,7 +22,6 @@
     "gulp-preprocess": "3.0.3",
     "merge-stream": "2.0.0",
     "proxyquire": "2.1.3",
-    "request-micro": "2.0.1",
     "sinon": "9.0.2",
     "sinon-chai": "3.7.0",
     "ts-node": "9.1.1",

package/services/gridService.js

@@ -4,7 +4,7 @@
 
 const _ = require('lodash');
 
-const { GridError, ArgError } = require('../errors');
+const { GridError, ArgError, GridConcurrencyError } = require('../errors');
 const { hasTestPlanFlag, promiseMap } = require('../utils');
 const { gridMessages, gridTypes } = require('../commons/constants');
 const logger = require('../commons/logger').getLogger('grid-service');
@@ -97,7 +97,7 @@ async function handleGetGridResponse(projectId, companyId, workerId, browser, ge
     }
 
     if (isError() && res.code === 'no-available-slot') {
-        throw new GridError(`Failed to run test on ${browser} - concurrency limit reached`);
+        throw new GridConcurrencyError(`Failed to run test on ${browser} - concurrency limit reached`);
     }
 
     logger.error('invalid code error response - get grid', { res });

package/workers/BaseWorker.js

@@ -18,7 +18,7 @@ const { releasePlayer } = require('./workerUtils');
 const featureFlags = require('../commons/featureFlags');
 const perf = require('../commons/performance-logger');
 const {
-    SeleniumError, StopRunOnError, GridError, GetBrowserError, NotImplementedError, PageNotAvailableError,
+    SeleniumError, StopRunOnError, GridError, GetBrowserError, NotImplementedError, PageNotAvailableError, GridConcurrencyError,
 } = require('../errors');
 
 const { GET_BROWSER_TIMEOUT_MSG, TEST_START_TIMEOUT_MSG, TEST_COMPLETE_TIMEOUT_MSG } = timeoutMessages;
@@ -166,7 +166,12 @@ class BaseWorker {
                 try {
                     return await utils.promiseTimeout(this.getSlotOnce(testRunHandler), this.options.getBrowserTimeout, timeoutMessages.GET_BROWSER_TIMEOUT_MSG);
                 } catch (error) {
-                    logger.error('error getting grid slot', { error, testId: this.testId, testResultId: this.testResultId, executionId: this.executionId });
+                    const logDetails = { testId: this.testId, testResultId: this.testResultId, executionId: this.executionId };
+                    if (error instanceof GridConcurrencyError) {
+                        logger.info('could not get grid slot due to concurrency issue', logDetails);
+                    } else {
+                        logger.error('error getting grid slot', { error, ...logDetails });
+                    }
                     failedGetSlotAttempts++;
                     await utils.delay(this.options.getBrowserTimeout - (Date.now() - startTime));
                     throw error;

package/workers/WorkerAppium.js

@@ -76,9 +76,9 @@ class WorkerAppium extends BaseWorker {
             _executionId, _testId, _testResultId,
             _options: { project: projectId },
         } = testRunHandler;
-        const { projectData: { type: projectType }, company: { companyId }, gridId } = this.options;
+        const { projectData: { type: projectType }, company: { companyId }, gridData: { gridId } } = this.options;
 
-        const selectedDeviceArr = await testimServicesApi.getMobileDevicesFromGrid({ projectType, companyId, gridId, selectors: `device_id:${activeSession.capabilities.udid}` });
+        const selectedDeviceArr = await testimServicesApi.getMobileDevicesFromGrid({ projectId, projectType, companyId, gridId, selectors: `device_id:${activeSession.capabilities.udid}` });
         const deviceName = selectedDeviceArr[0]?.name;
 
         const device = {