@mablhq/mabl-cli 1.54.3 → 1.55.2

package/commands/commandUtil/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseColinJoinedVariablePair = exports.validateValuePairInputs = exports.validateArrayInputs = exports.getWorkspaceIdFromAppOrEnv = exports.getJourneyFlowArray = exports.TEST_INFO_NOT_FOUND = exports.getWorkspaceId = exports.failWrapper = exports.getDescribeDescriptions = void 0;
+exports.parseColinJoinedVariablePair = exports.validateValuePairInputs = exports.validateArrayInputs = exports.getWorkspaceIdFromAppOrEnv = exports.getJourneyFlowArray = exports.TEST_WITHOUT_FLOWS_MESSAGE = exports.getWorkspaceId = exports.failWrapper = exports.getDescribeDescriptions = void 0;
 const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
 const constants_1 = require("../constants");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
@@ -36,10 +36,10 @@ async function getWorkspaceId(parsed) {
     throw new Error('Please specify a workspace ID (--workspace-id) or configure a default in the CLI (mabl config set workspace <id>)');
 }
 exports.getWorkspaceId = getWorkspaceId;
-exports.TEST_INFO_NOT_FOUND = `Test info not found. You may need to specify a branch [--${constants_1.CommandArgMablBranch}] if the test is not on master.`;
+exports.TEST_WITHOUT_FLOWS_MESSAGE = `Test does not have any flows. You may need to specify a branch [--${constants_1.CommandArgMablBranch}] if the test is not on master.`;
 async function getJourneyFlowArray(journey, apiClient, branchName) {
     if (!journey.flows || !journey.flows.length) {
-        throw new Error(exports.TEST_INFO_NOT_FOUND);
+        throw new Error(exports.TEST_WITHOUT_FLOWS_MESSAGE);
     }
     const flows = {};
     const requests = journey.flows.map((flowId) => apiClient

package/commands/tests/testsUtil.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBrowserType = exports.toBasicHttpAuthenticationCredentials = exports.logTestInfoIfPresent = exports.milliSecondsToSeconds = exports.calculateTotalTimeSeconds = exports.extractTestRunConfig = exports.pullDownTestRunConfig = exports.validateRunCommandWithLabels = exports.validateRunEditCommand = exports.cleanupTestResources = exports.sleep = exports.editTheTest = exports.runTheTest = exports.prepareTrainerForSplitPlayback = exports.cleanUpInitialPages = exports.getExtensionBackgroundPageWithCliTool = exports.createBrowserForExecutionEngine = exports.createBrowser = exports.getFinalUrl = void 0;
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const fs = __importStar(require("fs-extra"));
+const mablApi_1 = require("../../mablApi");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const browserLauncher_1 = require("../../browserLauncher/browserLauncher");
@@ -47,7 +48,7 @@ const chalk = require('chalk');
 let RUNNING_TEST = false;
 function getFinalUrl(test, parsedUrl) {
     const finalUrl = parsedUrl || test.url;
-    if (!finalUrl) {
+    if (!finalUrl && test.test_type !== mablApi_1.TestTypeEnum.Performance) {
         throw new Error('No default URL found on test, please specify a URL using the -u or --url flag');
     }
     return finalUrl;

package/commands/tests/tests_cmds/export.js

@@ -65,6 +65,9 @@ async function exportTest(parsed) {
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const branchName = (_a = parsed['mabl-branch']) !== null && _a !== void 0 ? _a : constants_1.DefaultBranchName;
     const journey = await apiClient.getJourney(testId, branchName, format);
+    if (journey.test_type === mablApi_1.TestTypeEnum.Performance) {
+        throw new Error('Export functionality is not yet available for performance tests.');
+    }
     const flowArray = await (0, util_1.getJourneyFlowArray)(journey, apiClient, branchName);
     if (flowArray
         .map((flow) => flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mablscript ||

package/commands/tests/tests_cmds/run-cloud.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
+const mablApi_1 = require("../../../mablApi");
 const constants_1 = require("../../constants");
 const util_1 = require("../../commandUtil/util");
 const branches_1 = require("../../commandUtil/branches");
@@ -200,19 +201,27 @@ async function runInCloud(parsed) {
 }
 async function executeRunCloudTest(test, browsers, branchName, apiClient, maybeDeploymentId, appUrl, apiUrl, credentialsId, applicationId, environmentId, basicAuthCredentialsId) {
     var _a;
-    const effectiveAppUrl = appUrl !== null && appUrl !== void 0 ? appUrl : test === null || test === void 0 ? void 0 : test.url;
+    const effectiveAppUrl = appUrl !== null && appUrl !== void 0 ? appUrl : (test.test_type === undefined || test.test_type === mablApi_1.TestTypeEnum.Browser
+        ? test === null || test === void 0 ? void 0 : test.url
+        : undefined);
+    const effectiveApiUrl = apiUrl !== null && apiUrl !== void 0 ? apiUrl : (test.test_type && test.test_type !== mablApi_1.TestTypeEnum.Browser
+        ? test === null || test === void 0 ? void 0 : test.url
+        : undefined);
     const workspaceId = test.organization_id;
     const testId = test.invariant_id;
     let deploymentIds;
-    if (!(effectiveAppUrl || maybeDeploymentId)) {
-        throw new Error(`There is no default URL for test [${testId}]. Please specify --${constants_1.CommandArgUrl}, --${constants_1.CommandArgUrlApp}, or --${constants_1.CommandArgDeploymentId}`);
+    if (!effectiveAppUrl && !effectiveApiUrl && !maybeDeploymentId) {
+        const urlCmdLineArg = test.test_type === mablApi_1.TestTypeEnum.Browser
+            ? `--${constants_1.CommandArgUrl}, --${constants_1.CommandArgUrlApp}`
+            : `--${constants_1.CommandArgUrlApi}`;
+        throw new Error(`There is no default URL for test [${testId}]. Please specify ${urlCmdLineArg} or --${constants_1.CommandArgDeploymentId}`);
     }
     loggingProvider_1.logger.info(chalk.cyan(`Running test: `, chalk.magenta(`${test.name} - ${testId} - on branch - ${branchName}`)));
     if (effectiveAppUrl) {
         loggingProvider_1.logger.info(chalk.cyan(`App/web URL: `, chalk.magenta(effectiveAppUrl)));
     }
-    if (apiUrl) {
-        loggingProvider_1.logger.info(chalk.cyan(`API URL: `, chalk.magenta(apiUrl)));
+    if (effectiveApiUrl) {
+        loggingProvider_1.logger.info(chalk.cyan(`API URL: `, chalk.magenta(effectiveApiUrl)));
     }
     if (applicationId || environmentId) {
         const deploymentsResult = await apiClient.queryDeploymentEntities(workspaceId);
@@ -225,7 +234,7 @@ async function executeRunCloudTest(test, browsers, branchName, apiClient, maybeD
         }
         deploymentIds = foundDeployments.map((deployment) => deployment.id);
     }
-    const planRun = await apiClient.postPlanRun(workspaceId, testId, branchName, browsers, effectiveAppUrl, apiUrl, maybeDeploymentId, credentialsId, deploymentIds, basicAuthCredentialsId);
+    const planRun = await apiClient.postPlanRun(workspaceId, testId, branchName, browsers, effectiveAppUrl, effectiveApiUrl, maybeDeploymentId, credentialsId, deploymentIds, basicAuthCredentialsId);
     const testRunsQueryResult = await apiClient.getTestRunsForPlan(planRun.id);
     return (_a = testRunsQueryResult.test_script_executions) !== null && _a !== void 0 ? _a : [];
 }