@testim/testim-cli 3.195.0 → 3.199.0

package/commons/testimServicesApi.js

@@ -55,11 +55,6 @@ function putAuth(url, body) {
         .then(headers => httpRequest.put(`${config.SERVICES_HOST}${url || ''}`, body, headers));
 }
 
-function getTextWithAuth(url, query) {
-    return getTokenHeader()
-        .then(headers => httpRequest.getText(`${config.SERVICES_HOST}${url || ''}`, query, headers));
-}
-
 function getWithAuth(url, query, options, timeout) {
     return getTokenHeader()
         .then(headers => httpRequest.get(`${config.SERVICES_HOST}${url || ''}`, query, headers, timeout, options));
@@ -69,10 +64,6 @@ function getS3Artifact(url, timeout) {
     return utils.runWithRetries(() => getWithAuth(`/storage${url}`, null, { isBinary: true }, timeout));
 }
 
-function getS3ArtifactText(url) {
-    return utils.runWithRetries(() => getTextWithAuth(`/storage${url}`));
-}
-
 function getTestPlan(projectId, testPlanNames) {
     //TODO: need to be checked after 3 months to prevent users from using old version
     const parseProperty = (dataValue) => (dataValue == null ? [] : (typeof (dataValue) === 'string' && JSON.parse(dataValue)) || dataValue);
@@ -100,21 +91,15 @@ function saveTestPlanResult(projectId, testPlanId, result) {
     return utils.runWithRetries(() => postAuth({ url: '/testPlan/result', body: { projectId, testPlanId, result } }));
 }
 
-function updateTestStatus(status, executionId, testId, resultId, startTime, endTime, success, failureReason, config, projectId, remoteRunId, testRetryKey, apiRetries = DEFAULT_REQUEST_RETRY) {
+function updateTestStatus(projectId, executionId, testId, resultId, status, data, apiRetries = DEFAULT_REQUEST_RETRY) {
     return utils.runWithRetries(() => putAuth('/result/run/test', {
         runId: executionId,
         testId,
-        startTime,
-        endTime,
-        success,
-        failureReason,
         resultId,
         status,
-        config,
         projectId,
         runnerVersion,
-        remoteRunId,
-        testRetryKey,
+        ...data,
     }), apiRetries);
 }
 
@@ -182,14 +167,6 @@ function reportExecutionFinished(status, executionId, projectId, success, tmsOpt
     }), DEFAULT_REQUEST_RETRY);
 }
 
-function getBranchData(projectId, branchName) {
-    return utils.runWithRetries(() => getWithAuth(`/branch/branchData/${encodeURIComponent(branchName)}`, { projectId }));
-}
-
-function getUserDetails(userId) {
-    return utils.runWithRetries(() => getWithAuth(`/user/user/${userId}`));
-}
-
 function getTestPlanTestList(projectId, names, planIds, branch) {
     return utils.runWithRetries(() => postAuth({
         url: '/testPlan/list',
@@ -243,11 +220,11 @@ function keepAliveGrid(projectId, slots) {
     });
 }
 
-function releaseGridSlot(projectId, slotId, gridId, browser) {
+function releaseGridSlot(companyId, projectId, slotId, gridId, browser) {
     return postAuth({
         url: `/grid/release?reqId=${utils.guid()}`,
         body: {
-            projectId, slotId, gridId, browser,
+            companyId, projectId, slotId, gridId, browser,
         },
     });
 }
@@ -259,23 +236,16 @@ function getHybridGridProvider(body) {
     });
 }
 
-function getGridByProject(projectId, gridName, browser, executionId) {
+function getGridByName(companyId, projectId, gridName, browser, executionId) {
     return utils.runWithRetries(() => getWithAuth('/grid/name', {
-        projectId, name: gridName, browser, executionId, reqId: utils.guid(),
+        companyId, projectId, name: gridName, browser, executionId, reqId: utils.guid(),
     }));
 }
 
-function getGridById(projectId, gridId, browser, executionId) {
-    return utils.runWithRetries(() => getWithAuth(`/grid/${gridId}`, { projectId, browser, executionId, reqId: utils.guid() }));
-}
-
-function getCompanyByProjectId(projectId) {
-    return utils.runWithRetries(() => getWithAuth(`/company/company/${projectId}`));
+function getGridById(companyId, projectId, gridId, browser, executionId) {
+    return utils.runWithRetries(() => getWithAuth(`/grid/${gridId}`, { companyId, projectId, browser, executionId, reqId: utils.guid() }));
 }
 
-function getProject(projectId) {
-    return utils.runWithRetries(() => getWithAuth(`/v2/project/project?projectId=${projectId}`));
-}
 
 async function initializeUserWithAuth({ projectId, token, branchName, lightweightMode, localGrid }) {
     try {
@@ -325,38 +295,6 @@ const fetchLambdatestConfig = async () => utils.runWithRetries(() => getWithAuth
 
 const getLabFeaturesByProjectId = async (projectId) => utils.runWithRetries(() => getWithAuth(`/labFeature/v2/project/${projectId}`));
 
-function getAppUploadUrl(projectId, projectArn, appName) {
-    return utils.runWithRetries(() => postAuth({
-        url: '/deviceFarm/app',
-        body: {
-            projectId,
-            projectArn,
-            appName,
-        },
-    }));
-}
-
-function createDeviceFarmRun(companyId, projectId, projectArn, appArn, configuration, branch, executionId, env, remoteRunObject) {
-    return postAuth({
-        url: '/deviceFarm/run',
-        body: {
-            companyId,
-            projectId,
-            projectArn,
-            appArn,
-            configuration,
-            branch,
-            executionId,
-            env,
-            remoteRunObject,
-        },
-        timeout: 30000,
-    });
-}
-
-function getDeviceFarmRun(projectId, runArn) {
-    return getWithAuth(`/deviceFarm/run?projectId=${projectId}&runArn=${runArn}`);
-}
 
 function getRealData(projectId, channel, query) {
     return utils.runWithRetries(() => getWithAuth(`/real-data/${channel}?${query}&projectId=${projectId}`));
@@ -492,30 +430,22 @@ function addTestRetry({
 
 module.exports = {
     getS3Artifact,
-    getS3ArtifactText,
     getTestPlan,
     saveTestPlanResult,
     updateTestStatus,
     updateExecutionTests,
     reportExecutionStarted,
     reportExecutionFinished,
-    getBranchData,
-    getUserDetails,
     getTestPlanTestList,
     getSuiteTestList,
-    getCompanyByProjectId,
-    getProject,
     getUsageForCurrentBillingPeriod,
     getTestResults,
-    getGridByProject,
+    getGridByName,
     releaseGridSlot,
     keepAliveGrid,
     getGridById,
     getAllGrids,
     fetchLambdatestConfig,
-    getAppUploadUrl,
-    createDeviceFarmRun,
-    getDeviceFarmRun,
     getRealData,
     updateTestResult,
     clearTestResult,

package/executionQueue.js

@@ -1,12 +1,10 @@
-"use strict";
+'use strict';
 
 const TestRun = require('./testRunHandler.js');
 
 class ExecutionQueue {
     constructor(executionId, testList, options, branchToUse, testStatus) {
-        this._waitingTests = testList.map(testInfo => {
-            return new TestRun(executionId, testInfo, options, branchToUse, testStatus);
-        });
+        this._waitingTests = testList.map(testInfo => new TestRun(executionId, testInfo, options, branchToUse, testStatus));
     }
 
     getNext() {
@@ -14,6 +12,11 @@ class ExecutionQueue {
         if (nextTestRunHandler) {
             return nextTestRunHandler;
         }
+        return undefined;
+    }
+
+    hasMoreTests() {
+        return Boolean(this._waitingTests.length);
     }
 }