@mablhq/mabl-cli 2.51.18 → 2.51.28

package/commands/tests/testsUtil.js

@@ -397,6 +397,10 @@ async function pullDownTestRunConfig(testRunId, apiClient) {
     const planRun = await apiClient.getPlanRun(journeyRun.parent_execution);
     const testDatatablevariables = ((_a = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _a === void 0 ? void 0 : _a.user_variables) &&
         (0, utils_1.variableRowAsScenario)((_b = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _b === void 0 ? void 0 : _b.user_variables);
+    const dataTableId = testDatatablevariables === null || testDatatablevariables === void 0 ? void 0 : testDatatablevariables.table_id;
+    if (dataTableId) {
+        await apiClient.getDataTable(dataTableId);
+    }
     return {
         basicAuthCredentialsId: ((_c = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _c === void 0 ? void 0 : _c.http_auth_credentials_required)
             ? (_d = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _d === void 0 ? void 0 : _d.http_auth_credentials_id

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeRunCloudTest = void 0;
 const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
 const mablApi_1 = require("../../../mablApi");
 const constants_1 = require("../../constants");
@@ -12,6 +13,7 @@ const env_1 = require("../../../env/env");
 const pluralize_1 = __importDefault(require("pluralize"));
 const testsUtil_1 = require("../testsUtil");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
+const runUtil_1 = require("../../../util/runUtil");
 const inquirer = require('inquirer');
 const chalk = require('chalk');
 const CommandArgTestId = constants_1.CommandArgId;
@@ -218,7 +220,7 @@ async function runInCloud(parsed) {
     return outputUrl;
 }
 async function executeRunCloudTest(test, browsers, branchName, apiClient, maybeDeploymentId, appUrl, apiUrl, credentialsId, applicationId, environmentId, basicAuthCredentialsId, localizationOptions) {
-    var _a;
+    var _a, _b;
     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);
@@ -243,9 +245,12 @@ async function executeRunCloudTest(test, browsers, branchName, apiClient, maybeD
     }
     if (applicationId || environmentId) {
         const deploymentsResult = await apiClient.queryDeploymentEntities(workspaceId);
+        const testType = (_a = test.test_type) !== null && _a !== void 0 ? _a : mablApi_1.TestTypeEnum.Browser;
+        const expectedDeploymentType = (0, runUtil_1.getExpectedDeploymentType)(testType);
         const foundDeployments = deploymentsResult.deployments
             ? deploymentsResult.deployments.filter((deployment) => (!applicationId || deployment.application_id === applicationId) &&
-                (!environmentId || deployment.environment_id === environmentId))
+                (!environmentId || deployment.environment_id === environmentId) &&
+                deployment.deployment_type === expectedDeploymentType)
             : [];
         if (!foundDeployments.length) {
             throw new Error('No configuration was found for the applicationId/environmentId specified');
@@ -254,8 +259,9 @@ async function executeRunCloudTest(test, browsers, branchName, apiClient, maybeD
     }
     const planRun = await apiClient.postPlanRun(workspaceId, testId, branchName, browsers, effectiveAppUrl, effectiveApiUrl, maybeDeploymentId, credentialsId, deploymentIds, basicAuthCredentialsId, localizationOptions);
     const testRunsQueryResult = await apiClient.getTestRunsForPlan(planRun.id);
-    return (_a = testRunsQueryResult.test_script_executions) !== null && _a !== void 0 ? _a : [];
+    return (_b = testRunsQueryResult.test_script_executions) !== null && _b !== void 0 ? _b : [];
 }
+exports.executeRunCloudTest = executeRunCloudTest;
 async function getJourneysForLabels(workspaceId, branchName, branchChangesOnly, labelsInclude, labelsExclude, limit, prompt, apiClient) {
     var _a;
     const journeys = await apiClient.getJourneys({

package/core/execution/ApiTestUtils.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PRE_REQUEST_LISTEN = exports.convertMablAssertionsToExecArray = exports.convertMablVariableAssignmentsToExecArray = exports.createMablGeneratedScripts = exports.insertMablAssertionScripts = exports.toPostmanScript = exports.replaceVariables = exports.getActualValue = exports.readBody = exports.getResponseContentType = exports.valueToUnquotedString = exports.assertionTypeSupportsCaseSensitivity = exports.assertionTargetSupportsCaseSensitivity = exports.humanizeAssertion = exports.getAssertionTargetArgument = exports.assertionHasTest = exports.isValidMablAssertion = exports.normalizeRegExpExpectedValue = exports.normalizeExpectedValue = exports.normalizeAssertionValue = exports.assertionRequiresValue = exports.filterValidMablAssertions = exports.filterValidMablVariableAssignments = exports.isValidMablVariableAssignment = exports.removeMablGeneratedScripts = exports.createEmptyRequestEvent = exports.findFirstMatchingEvent = exports.restoreCustomRequestFields = exports.deduplicateApiTestExecutionResults = exports.createEmptyVariable = exports.createEmptyAssertion = exports.humanizeAssertionType = exports.getAssertionTypesForTarget = exports.caseInsensitiveEquals = exports.compareStringsCaseInsensitive = exports.ASSERT_TYPES = exports.ASSERT_TARGETS = exports.COLLECTION_WITH_FOLDERS_ERROR = exports.HMAC_SHA1_SIGNATURE = exports.DEFAULT_ADD_OAUTH1_TO_HEADER_VALUE = exports.DEFAULT_OAUTH1_VERSION = exports.OAUTH1_AUTH = exports.NO_AUTH = exports.BEARER_TOKEN_AUTH = exports.BASIC_AUTH = exports.API_KEY_AUTH = exports.INHERIT_AUTH_FROM_PARENT_VALUE = exports.MABL_GENERATED_COMMENT = exports.MABL_GENERATED_ASSERTION_TOKEN = exports.TEST_LISTEN = void 0;
-exports.uuid = exports.postmanEventToExecutableSnippets = exports.postmanAuthToApiTestAuth = exports.getValueFromAuthVariables = exports.executableSnippetToApiTestSnippet = exports.executableSnippetsToPostmanEvent = exports.apiTestAuthToPostmanAuth = exports.insertTestConfigurationIntoFlow = exports.createCommentForApiTestSnippet = exports.convertMablSnippetsToExecArray = exports.createPostmanScript = exports.insertMablScriptsIntoCollection = exports.processPostmanItem = exports.replaceRawScriptWithExecArray = exports.removeInvalidHeaders = exports.processItemAuth = exports.mablAuthToPostman = exports.formatContent = exports.getRequestMode = exports.getFormDataArray = exports.isText = exports.isXML = exports.isJson = exports.isSupportedAuthType = exports.isItemDefinition = exports.isCollectionDefinition = exports.isItemGroupDefinition = exports.isFolder = exports.validateCollectionFeaturesForApiTestEditor = exports.generateRawScriptField = exports.processPostmanItems = exports.createEmptyRequest = exports.createEmptyRequestEventArray = exports.splitLines = void 0;
+exports.uuid = exports.postmanEventToExecutableSnippets = exports.postmanAuthToApiTestAuth = exports.getValueFromAuthVariables = exports.executableSnippetToApiTestSnippet = exports.executableSnippetsToPostmanEvent = exports.apiTestAuthToPostmanAuth = exports.insertTestConfigurationIntoFlow = exports.createCommentForApiTestSnippet = exports.convertMablSnippetsToExecArray = exports.createPostmanScript = exports.insertMablScriptsIntoCollection = exports.processPostmanItem = exports.replaceRawScriptWithExecArray = exports.removeInvalidHeaders = exports.processItemAuth = exports.mablAuthToPostman = exports.formatContent = exports.getRequestMode = exports.getFormDataArray = exports.isBinary = exports.isText = exports.isXML = exports.isJson = exports.isSupportedAuthType = exports.isItemDefinition = exports.isCollectionDefinition = exports.isItemGroupDefinition = exports.isFolder = exports.validateCollectionFeaturesForApiTestEditor = exports.generateRawScriptField = exports.processPostmanItems = exports.createEmptyRequest = exports.createEmptyRequestEventArray = exports.splitLines = void 0;
 const newman_types_1 = require("./newman-types");
 const lodash_1 = __importDefault(require("lodash"));
 const uuid_1 = require("uuid");
@@ -28,12 +28,14 @@ exports.COLLECTION_WITH_FOLDERS_ERROR = 'Collections with folders are not suppor
 const RESPONSE_PROPERTIES = {
     Size: 'size().body',
     Status: 'code',
+    TextBody: 'text()',
 };
 exports.ASSERT_TARGETS = [
     { label: 'Header', value: newman_types_1.AssertionTarget.Header },
     { label: 'Status', value: newman_types_1.AssertionTarget.Status },
     { label: 'Size', value: newman_types_1.AssertionTarget.Size },
     { label: 'JSON Body', value: newman_types_1.AssertionTarget.JSONBody },
+    { label: 'Text Body', value: newman_types_1.AssertionTarget.TextBody },
 ];
 exports.ASSERT_TYPES = [
     { label: 'Equals', value: newman_types_1.AssertionType.Equals },
@@ -100,6 +102,7 @@ function getAssertionTypesForTarget(target) {
             ].includes(assertType.value));
         case newman_types_1.AssertionTarget.Header:
         case newman_types_1.AssertionTarget.JSONBody:
+        case newman_types_1.AssertionTarget.TextBody:
         default:
             return exports.ASSERT_TYPES;
     }
@@ -134,19 +137,29 @@ function humanizeAssertionType(assertionType) {
     }
 }
 exports.humanizeAssertionType = humanizeAssertionType;
-function createEmptyAssertion() {
+function createEmptyAssertion(contentType) {
+    const isJsonContent = !contentType || isJson(contentType);
     return {
         id: (0, uuid_1.v4)(),
-        assertTarget: newman_types_1.AssertionTarget.JSONBody,
+        assertTarget: isJsonContent
+            ? newman_types_1.AssertionTarget.JSONBody
+            : isText(contentType) || isXML(contentType)
+                ? newman_types_1.AssertionTarget.TextBody
+                : newman_types_1.AssertionTarget.Header,
         assertType: newman_types_1.AssertionType.Present,
         description: '',
     };
 }
 exports.createEmptyAssertion = createEmptyAssertion;
-function createEmptyVariable() {
+function createEmptyVariable(contentType) {
+    const isJsonContent = !contentType || isJson(contentType);
     return {
         id: (0, uuid_1.v4)(),
-        assertTarget: newman_types_1.AssertionTarget.JSONBody,
+        assertTarget: isJsonContent
+            ? newman_types_1.AssertionTarget.JSONBody
+            : isText(contentType) || isXML(contentType)
+                ? newman_types_1.AssertionTarget.TextBody
+                : newman_types_1.AssertionTarget.Header,
         variableName: '',
         description: '',
     };
@@ -337,6 +350,9 @@ function isValidMablAssertion(assertion) {
             valid =
                 isValidSizeAssertionType(assertion.assertType) && hasExpectedValue;
             break;
+        case 'TextBody':
+            valid = hasExpectedValue;
+            break;
     }
     return valid;
 }
@@ -379,17 +395,22 @@ function getAssertionTargetArgument(assertion) {
 }
 exports.getAssertionTargetArgument = getAssertionTargetArgument;
 function humanizeAssertion(assertion) {
+    var _a, _b;
     const { assertTarget, assertType, value, description } = assertion;
     if (description && description !== '') {
         return description;
     }
+    const humanizedAssertTarget = (_b = (_a = exports.ASSERT_TARGETS.filter((target) => target.value === assertTarget)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.label;
     if (assertionHasTest(assertion)) {
         const assertionTargetArgument = getAssertionTargetArgument(assertion);
-        const humanized = `${exports.ASSERT_TARGETS.filter((target) => target.value === assertTarget)[0].label}${assertionTargetArgument ? ` ${assertionTargetArgument}` : ''} ${humanizeAssertionType(assertType)}`;
+        const humanized = `${humanizedAssertTarget}${assertionTargetArgument ? ` ${assertionTargetArgument}` : ''} ${humanizeAssertionType(assertType)}`;
         return assertionRequiresValue(assertion)
             ? `${humanized} ${value}`
             : humanized;
     }
+    if (assertType && humanizedAssertTarget) {
+        return `${humanizedAssertTarget} ${humanizeAssertionType(assertType)}`;
+    }
     return '';
 }
 exports.humanizeAssertion = humanizeAssertion;
@@ -412,6 +433,8 @@ function generateAssertionScript(assertion) {
             return generateHeaderAssertion(description, assertType, assertion.headerName, expectedValue, caseSensitive);
         case 'Size':
             return generateSizeAssertion(description, assertTarget, assertType, expectedValue);
+        case 'TextBody':
+            return generateTextBodyAssertion(description, assertType, expectedValue, caseSensitive);
     }
     return;
 }
@@ -552,6 +575,31 @@ function generateSizeAssertion(description, target, type, expectedValue) {
     }
     return generateSimpleAssertion(description, target, type, expectedValue);
 }
+function generateTextBodyAssertion(description, assertType, expectedValue, caseSensitive) {
+    let target = 'pm.response.text()';
+    switch (assertType) {
+        case 'Present':
+        case 'NotPresent':
+        case 'Equals':
+        case 'NotEquals':
+        case 'Contains':
+        case 'DoesNotContain':
+        case 'StartsWith':
+        case 'EndsWith':
+        case 'MatchesRegExp':
+            break;
+        case 'GreaterThan':
+        case 'GreaterThanOrEqualTo':
+        case 'LessThan':
+        case 'LessThanOrEqualTo':
+            target = `parseFloat(${target})`;
+            expectedValue = `parseFloat(${expectedValue})`;
+            break;
+        default:
+            throw new Error(`Unexpected header assert type: ${assertType}`);
+    }
+    return generatePostmanAssertion(description, target, assertType, expectedValue, caseSensitive);
+}
 function generateSimpleAssertion(description, target, type, expectedValue, caseSensitive = true) {
     return generatePostmanTest(description, generatePostmanExpect(getResponseProperty(target), type, expectedValue, caseSensitive));
 }
@@ -579,6 +627,7 @@ function assertionTargetSupportsCaseSensitivity(assertTarget) {
     switch (assertTarget) {
         case 'Header':
         case 'JSONBody':
+        case 'TextBody':
             return true;
         default:
             return false;
@@ -653,13 +702,13 @@ function readBody(body, contentType) {
 }
 exports.readBody = readBody;
 function getActualValue(assertion, apiStepExecutionResult, variables) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const { assertTarget, bodyPath, headerName } = assertion;
+    const contentType = getResponseContentType(apiStepExecutionResult.response);
     switch (assertTarget) {
         case newman_types_1.AssertionTarget.Header:
             return ((_b = (_a = apiStepExecutionResult.response) === null || _a === void 0 ? void 0 : _a.header) !== null && _b !== void 0 ? _b : []).find((header) => caseInsensitiveEquals(header.key, headerName));
         case newman_types_1.AssertionTarget.JSONBody:
-            const contentType = getResponseContentType(apiStepExecutionResult.response);
             const content = readBody((_c = apiStepExecutionResult.response) === null || _c === void 0 ? void 0 : _c.stream, contentType);
             return bodyPath
                 ? lodash_1.default.get(content, replaceVariables(bodyPath, variables))
@@ -668,6 +717,8 @@ function getActualValue(assertion, apiStepExecutionResult, variables) {
             return (_d = apiStepExecutionResult.response) === null || _d === void 0 ? void 0 : _d.responseSize;
         case newman_types_1.AssertionTarget.Status:
             return (_e = apiStepExecutionResult.response) === null || _e === void 0 ? void 0 : _e.code;
+        case newman_types_1.AssertionTarget.TextBody:
+            return readBody((_f = apiStepExecutionResult.response) === null || _f === void 0 ? void 0 : _f.stream, contentType);
     }
     return null;
 }
@@ -822,6 +873,10 @@ function isText(contentType) {
     return contentTypeMatches(contentType, (ct) => ct.startsWith('text/'));
 }
 exports.isText = isText;
+function isBinary(contentType) {
+    return contentTypeMatches(contentType, (ct) => ct.startsWith('image/'), (ct) => ct.startsWith('audio/'), (ct) => ct.startsWith('video/'), (ct) => ct.startsWith('application/octet-stream'), (ct) => ct.startsWith('application/zip'), (ct) => ct.startsWith('application/gzip'), (ct) => ct.startsWith('application/x-gzip'), (ct) => ct.startsWith('application/x-tar'), (ct) => ct.startsWith('application/x-rar-compressed'), (ct) => ct.startsWith('application/x-7z-compressed'), (ct) => ct.startsWith('application/x-bzip'), (ct) => ct.startsWith('application/x-rar'));
+}
+exports.isBinary = isBinary;
 function contentTypeMatches(contentType, ...predicates) {
     if (!contentType) {
         return false;

package/core/execution/PostmanUtils.js

@@ -22,8 +22,9 @@ function exportVariables(postmanResult) {
     ].filter((variables) => !!variables);
     const exportedVariables = {};
     variablePrecedence
-        .map((variableList) => variableList.all())
-        .forEach((variables) => variables.forEach((variable) => (exportedVariables[variable.key] = variable.value)));
+        .flatMap((variableList) => variableList.all())
+        .filter((variable) => { var _a; return Boolean(variable.key) && !((_a = variable.key) === null || _a === void 0 ? void 0 : _a.startsWith(VariableUtils_1.FLOW_NAMESPACE)); })
+        .forEach((variable) => (exportedVariables[variable.key] = variable.value));
     return exportedVariables;
 }
 exports.exportVariables = exportVariables;

package/core/execution/VariableUtils.js

@@ -11,7 +11,7 @@ exports.API_CREDENTIALS_USERNAME_VARIABLE_NAME = `${exports.API_CREDENTIALS_NAME
 exports.API_CREDENTIALS_PASSWORD_VARIABLE_NAME = `${exports.API_CREDENTIALS_NAMESPACE}password`;
 function generateVariablesSummaryForImport(variableSources) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { environment, scenario, url, credentials, plan, flow, journeyRun, previousFlowVariables, } = variableSources;
+    const { environment, scenario, url, credentials, plan, flow, journeyRun, previousFlowVariables, flowConfiguration, } = variableSources;
     const summary = {
         dataDriven: {},
         effective: {},
@@ -47,10 +47,12 @@ function generateVariablesSummaryForImport(variableSources) {
     precedence.forEach((variables) => Object.keys(variables).forEach((name) => (summary.effective[name] = variables[name])));
     if (flow === null || flow === void 0 ? void 0 : flow.parameters) {
         flow.parameters.forEach((parameter) => {
-            const parameterName = removePrefix(parameter.name, exports.FLOW_NAMESPACE);
-            summary.flow[parameterName] = parameter.default_value;
+            var _a, _b;
+            const parameterName = `${exports.FLOW_NAMESPACE}${parameter.name}`;
+            const parameterValue = (_b = (_a = flowConfiguration === null || flowConfiguration === void 0 ? void 0 : flowConfiguration.parameters) === null || _a === void 0 ? void 0 : _a[parameter.name]) !== null && _b !== void 0 ? _b : parameter.default_value;
+            summary.flow[parameterName] = parameterValue;
             if (!summary.effective[parameterName]) {
-                summary.effective[parameterName] = parameter.default_value;
+                summary.effective[parameterName] = parameterValue;
             }
         });
     }

package/core/execution/newman-types.js

@@ -7,6 +7,7 @@ var AssertionTarget;
     AssertionTarget["JSONBody"] = "JSONBody";
     AssertionTarget["Size"] = "Size";
     AssertionTarget["Status"] = "Status";
+    AssertionTarget["TextBody"] = "TextBody";
 })(AssertionTarget || (exports.AssertionTarget = AssertionTarget = {}));
 var AssertionType;
 (function (AssertionType) {

package/core/trainer/trainingSessions.js

@@ -9,6 +9,7 @@ const util_1 = require("../util");
 const openUtils_1 = require("./openUtils");
 const util_2 = require("../../commands/commandUtil/util");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
+const rbacUtils_1 = require("../../util/rbacUtils");
 const chalk = require('chalk');
 exports.DEFAULT_HEIGHT = 800;
 exports.DEFAULT_WIDTH = 1000;
@@ -40,6 +41,7 @@ async function trainNewTest(trainingSessionOptions) {
             process.exit(1);
         }
     }
+    await (0, rbacUtils_1.dataTablesRbacPreflight)(apiClient, dataTableIds);
     if (applicationId) {
         await apiClient.getApplication(applicationId);
     }
@@ -110,6 +112,7 @@ async function editTest(trainingSessionOptions) {
     if (test.default) {
         throw new Error('Editing of the mabl default supplied tests is not supported');
     }
+    await (0, rbacUtils_1.dataTablesRbacPreflight)(apiClient, test === null || test === void 0 ? void 0 : test.datatables);
     if (!((_g = test.flows) === null || _g === void 0 ? void 0 : _g.length) && test.test_type !== mablApi_1.TestTypeEnum.Performance) {
         throw new Error(util_2.TEST_WITHOUT_FLOWS_MESSAGE);
     }