@mablhq/mabl-cli 1.61.7 → 1.62.1

package/Globals.js

@@ -38,6 +38,15 @@ class Globals {
     static setPlaywrightInteractionWarningMs(timeout) {
         Globals.playwrightInteractionWarningMs = timeout;
     }
+    static getSslCaDir() {
+        return Globals.sslCaDir;
+    }
+    static getTestMaxAgeMs() {
+        return Globals.testMaxAgeMs;
+    }
+    static setTestMaxAgeMs(age) {
+        Globals.testMaxAgeMs = age;
+    }
     static getUploadDirectory() {
         return Globals.uploadDirectory;
     }
@@ -50,16 +59,11 @@ class Globals {
     static setUploadDirectoryPrefix(prefix) {
         Globals.uploadDirectoryPrefix = prefix;
     }
-    static getTestMaxAgeMs() {
-        return Globals.testMaxAgeMs;
-    }
-    static setTestMaxAgeMs(age) {
-        Globals.testMaxAgeMs = age;
-    }
 }
 exports.Globals = Globals;
 Globals.findOverallTimeoutMs = 18.5 * 60 * 1000;
 Globals.playwrightInteractionWarningMs = 30 * 1000;
+Globals.sslCaDir = '/usr/local/share/http-proxy-certs';
+Globals.testMaxAgeMs = 1000 * 60 * 60 * 24;
 Globals.uploadDirectory = os.tmpdir();
 Globals.uploadDirectoryPrefix = `mablTestRunUploads-`;
-Globals.testMaxAgeMs = 1000 * 60 * 60 * 24;

package/browserLauncher/playwrightBrowserLauncher/playwrightPage.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightPage = void 0;
 const events_1 = __importDefault(require("events"));
+const promises_1 = require("fs/promises");
 const browserLauncher_1 = require("../browserLauncher");
 const playwright = __importStar(require("@playwright/test"));
 const playwrightHttpResponse_1 = require("./playwrightHttpResponse");
@@ -352,5 +353,12 @@ class PlaywrightPage extends events_1.default {
     async getContentAsMhtml() {
         return this.delegate.getContentAsMhtml();
     }
+    async download(url, destination, encoding = 'binary') {
+        const response = await this.page.request.fetch(url);
+        const body = await response.body();
+        if (body) {
+            await (0, promises_1.writeFile)(destination, body, { encoding });
+        }
+    }
 }
 exports.PlaywrightPage = PlaywrightPage;

package/commands/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandArgContentTypes = exports.CommandArgPreview = exports.CommandArgOutputFilePath = exports.CommandArgOutput = exports.CommandArgNoPrompt = exports.CommandArgPrompt = exports.CommandArgPortNumber = exports.CommandArgName = exports.CommandArgMablBranchChangesOnly = exports.CommandArgMablBranch = exports.CommandArgMablAutoLogin = exports.CommandArgMablAutoBranch = exports.CommandArgLinkBypass = exports.CommandArgLinkLabel = exports.CommandArgLimitOutput = exports.CommandArgLabels = exports.CommandArgLabelsInclude = exports.CommandArgLabelsExclude = exports.CommandArgTestInteractionSpeed = exports.CommandArgTestRunId = exports.CommandArgTestFile = exports.CommandArgKeepBrowserOpen = exports.CommandArgInput = exports.CommandArgId = exports.CommandArgUserAgent = exports.CommandArgHttpHeaders = exports.CommandArgHelp = exports.CommandArgHeadless = exports.CommandArgFromPlanId = exports.CommandArgFrom = exports.CommandArgFormat = exports.CommandArgFindPath = exports.CommandArgFastFailure = exports.CommandArgOverrideEnvironmentId = exports.CommandArgExistingReport = exports.CommandArgEnvironmentId = exports.CommandArgEnableLink = exports.CommandArgDetailLevel = exports.CommandArgDescription = exports.CommandArgDeploymentId = exports.CommandArgDecrypt = exports.CommandArgDataTables = exports.CommandArgDataTableId = exports.CommandArgCredentials = exports.CommandArgBasicAuthCredentials = exports.CommandArgBrowsers = exports.CommandArgBrowser = exports.CommandArgApplicationId = exports.CommandArgApiKey = exports.CommandArgABConfigFile = void 0;
-exports.SCENARIO_ID_HEADER = exports.SCENARIO_NAME_HEADER = exports.ValidBrowserTypesForLocalRuns = exports.BrowserTypeSelections = exports.DefaultBrowserType = exports.DefaultBranchName = exports.DefaultOutputFormatChoices = exports.DetailLevelFormats = exports.ReporterOptions = exports.OutputFormats = exports.CommandArgAliases = exports.CommandArgBrowserEnableExtensions = exports.CommandArgBrowserIgnoreCertificateErrors = exports.CommandArgBrowserDisableIsolation = exports.ListTimeFormat = exports.CommandArgTimezoneID = exports.CommandArgLocale = exports.CommandArgScenarioId = exports.CommandArgReporterOptions = exports.CommandArgReporter = exports.CommandArgWorkspaceId = exports.CommandArgVersion = exports.CommandArgVariables = exports.CommandArgUrlApi = exports.CommandArgUrlApp = exports.CommandArgUrl = exports.CommandArgTrainerVersion = exports.CommandArgTo = exports.CommandArgSilent = exports.CommandArgRevision = exports.CommandArgMaxHeartbeatAge = exports.CommandArgPlanId = void 0;
+exports.CommandArgPlanId = exports.CommandArgContentTypes = exports.CommandArgPreview = exports.CommandArgOutputFilePath = exports.CommandArgOutput = exports.CommandArgNoPrompt = exports.CommandArgPrompt = exports.CommandArgPortNumber = exports.CommandArgName = exports.CommandArgMablBranchChangesOnly = exports.CommandArgMablBranch = exports.CommandArgMablAutoLogin = exports.CommandArgMablAutoBranch = exports.CommandArgLinkBypass = exports.CommandArgLinkLabel = exports.CommandArgLimitOutput = exports.CommandArgLabels = exports.CommandArgLabelsInclude = exports.CommandArgLabelsExclude = exports.CommandArgTestInteractionSpeed = exports.CommandArgTestRunId = exports.CommandArgTestFile = exports.CommandArgKeepBrowserOpen = exports.CommandArgInput = exports.CommandArgId = exports.CommandArgUserAgent = exports.CommandArgHttpHeaders = exports.CommandArgHelp = exports.CommandArgHeadless = exports.CommandArgFromPlanId = exports.CommandArgFrom = exports.CommandArgFormat = exports.CommandArgFindPath = exports.CommandArgFastFailure = exports.CommandArgOverrideEnvironmentId = exports.CommandArgExistingReport = exports.CommandArgEnvironmentId = exports.CommandArgDetailLevel = exports.CommandArgDescription = exports.CommandArgDeploymentId = exports.CommandArgDecrypt = exports.CommandArgDataTables = exports.CommandArgDataTableId = exports.CommandArgCredentials = exports.CommandArgBasicAuthCredentials = exports.CommandArgBrowsers = exports.CommandArgBrowser = exports.CommandArgApplicationId = exports.CommandArgApiKey = exports.CommandArgABConfigFile = void 0;
+exports.SCENARIO_ID_HEADER = exports.SCENARIO_NAME_HEADER = exports.ValidBrowserTypesForLocalRuns = exports.BrowserTypeSelections = exports.DefaultBrowserType = exports.DefaultBranchName = exports.DefaultOutputFormatChoices = exports.DetailLevelFormats = exports.ReporterOptions = exports.OutputFormats = exports.CommandArgAliases = exports.CommandArgBrowserEnableExtensions = exports.CommandArgBrowserIgnoreCertificateErrors = exports.CommandArgBrowserDisableIsolation = exports.ListTimeFormat = exports.CommandArgTimezoneID = exports.CommandArgLocale = exports.CommandArgUseTestExecutionProxy = exports.CommandArgScenarioId = exports.CommandArgReporterOptions = exports.CommandArgReporter = exports.CommandArgWorkspaceId = exports.CommandArgVersion = exports.CommandArgVariables = exports.CommandArgUrlApi = exports.CommandArgUrlApp = exports.CommandArgUrl = exports.CommandArgTrainerVersion = exports.CommandArgTo = exports.CommandArgSilent = exports.CommandArgRevision = exports.CommandArgMaxHeartbeatAge = void 0;
 const browserTypes_1 = require("./browserTypes");
 exports.CommandArgABConfigFile = 'ab-config-file';
 exports.CommandArgApiKey = 'api-key';
@@ -16,7 +16,6 @@ exports.CommandArgDecrypt = 'decrypt';
 exports.CommandArgDeploymentId = 'deployment-id';
 exports.CommandArgDescription = 'description';
 exports.CommandArgDetailLevel = 'detail-level';
-exports.CommandArgEnableLink = 'enable-link';
 exports.CommandArgEnvironmentId = 'environment-id';
 exports.CommandArgExistingReport = 'existing-report';
 exports.CommandArgOverrideEnvironmentId = 'override-environment-id';
@@ -68,6 +67,7 @@ exports.CommandArgWorkspaceId = 'workspace-id';
 exports.CommandArgReporter = 'reporter';
 exports.CommandArgReporterOptions = 'reporter-options';
 exports.CommandArgScenarioId = 'scenario-id';
+exports.CommandArgUseTestExecutionProxy = 'use-test-execution-proxy';
 exports.CommandArgLocale = 'locale';
 exports.CommandArgTimezoneID = 'timezone-id';
 exports.ListTimeFormat = 'MMM Do YYYY, HH:mm:ss';

package/commands/tests/testsUtil.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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;
+exports.parseBrowserType = exports.toBasicHttpAuthenticationCredentials = exports.logTestInfoIfPresent = exports.milliSecondsToSeconds = exports.calculateTotalTimeSeconds = exports.headerArrayToRecord = 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 os = __importStar(require("os"));
@@ -398,7 +398,7 @@ function validateRunCommandWithLabels(testId, suppliedLabelsInclude, suppliedLab
 }
 exports.validateRunCommandWithLabels = validateRunCommandWithLabels;
 async function pullDownTestRunConfig(testRunId, apiClient) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
     const journeyRun = await apiClient.getTestRun(testRunId);
     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) &&
@@ -414,18 +414,27 @@ async function pullDownTestRunConfig(testRunId, apiClient) {
         dataTableVariables: testDatatablevariables,
         deviceEmulation: (_h = journeyRun.journey_parameters) === null || _h === void 0 ? void 0 : _h.device_emulation,
         environmentId: (_k = (_j = journeyRun.journey_parameters) === null || _j === void 0 ? void 0 : _j.deployment) === null || _k === void 0 ? void 0 : _k.environment_id,
+        extraHttpHeaders: ((_l = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _l === void 0 ? void 0 : _l.http_headers_required) === true
+            ? (_o = (_m = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _m === void 0 ? void 0 : _m.http_headers) === null || _o === void 0 ? void 0 : _o.reduce((headers, header) => {
+                var _a;
+                return ({
+                    ...headers,
+                    [header.name]: (_a = header.value) !== null && _a !== void 0 ? _a : '',
+                });
+            }, {})
+            : undefined,
         filterHttpRequests: false,
-        importedVariables: (_l = journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.imported_variables,
+        importedVariables: (_p = journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.imported_variables,
         localizationOptions: journeyRun.localization_options,
-        pageLoadWait: (_m = journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.page_load_wait,
+        pageLoadWait: (_q = journeyRun.journey_parameters) === null || _q === void 0 ? void 0 : _q.page_load_wait,
         runId: journeyRun.id,
-        testId: (_o = journeyRun.journey) === null || _o === void 0 ? void 0 : _o.invariant_id,
-        url: (_q = (_p = journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.deployment) === null || _q === void 0 ? void 0 : _q.uri,
+        testId: (_r = journeyRun.journey) === null || _r === void 0 ? void 0 : _r.invariant_id,
+        url: (_t = (_s = journeyRun.journey_parameters) === null || _s === void 0 ? void 0 : _s.deployment) === null || _t === void 0 ? void 0 : _t.uri,
     };
 }
 exports.pullDownTestRunConfig = pullDownTestRunConfig;
 async function extractTestRunConfig(executionMessage, apiClient) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     const journeyRun = (_a = executionMessage.journey_run) !== null && _a !== void 0 ? _a : (await apiClient.getTestRun(executionMessage.journey_run_id));
     const planRun = executionMessage.plan_run;
     const maybeRunnerType = ((_b = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _b === void 0 ? void 0 : _b.nodejs_runtime_variant)
@@ -433,10 +442,10 @@ async function extractTestRunConfig(executionMessage, apiClient) {
             (_c = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _c === void 0 ? void 0 : _c.nodejs_runtime_variant
         : undefined;
     return {
-        branchName: (_d = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _d === void 0 ? void 0 : _d.source_control_tag,
-        basicAuthCredentialsId: ((_e = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _e === void 0 ? void 0 : _e.http_auth_credentials_required)
-            ? (_f = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _f === void 0 ? void 0 : _f.http_auth_credentials_id
+        basicAuthCredentialsId: ((_d = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _d === void 0 ? void 0 : _d.http_auth_credentials_required)
+            ? (_e = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _e === void 0 ? void 0 : _e.http_auth_credentials_id
             : undefined,
+        branchName: (_f = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _f === void 0 ? void 0 : _f.source_control_tag,
         credentialsId: ((_g = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _g === void 0 ? void 0 : _g.credentials_required)
             ? (_h = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _h === void 0 ? void 0 : _h.credentials_id
             : undefined,
@@ -444,17 +453,30 @@ async function extractTestRunConfig(executionMessage, apiClient) {
             (0, utils_1.variableRowAsScenario)((_k = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _k === void 0 ? void 0 : _k.user_variables),
         deviceEmulation: (_l = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.device_emulation,
         environmentId: (_o = (_m = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.deployment) === null || _o === void 0 ? void 0 : _o.environment_id,
+        extraHttpHeaders: ((_p = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _p === void 0 ? void 0 : _p.http_headers_required) === true
+            ? headerArrayToRecord((_q = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _q === void 0 ? void 0 : _q.http_headers)
+            : undefined,
         filterHttpRequests: true,
-        importedVariables: (_p = journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.imported_variables,
+        importedVariables: (_r = journeyRun.journey_parameters) === null || _r === void 0 ? void 0 : _r.imported_variables,
         localizationOptions: journeyRun.localization_options,
-        pageLoadWait: (_q = journeyRun.journey_parameters) === null || _q === void 0 ? void 0 : _q.page_load_wait,
+        pageLoadWait: (_s = journeyRun.journey_parameters) === null || _s === void 0 ? void 0 : _s.page_load_wait,
         runId: journeyRun.id,
         runnerType: maybeRunnerType,
-        testId: (_r = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _r === void 0 ? void 0 : _r.invariant_id,
-        url: (_t = (_s = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _s === void 0 ? void 0 : _s.deployment) === null || _t === void 0 ? void 0 : _t.uri,
+        testId: (_t = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _t === void 0 ? void 0 : _t.invariant_id,
+        url: (_v = (_u = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _u === void 0 ? void 0 : _u.deployment) === null || _v === void 0 ? void 0 : _v.uri,
     };
 }
 exports.extractTestRunConfig = extractTestRunConfig;
+function headerArrayToRecord(headers) {
+    return headers === null || headers === void 0 ? void 0 : headers.reduce((headers, header) => {
+        var _a;
+        return ({
+            ...headers,
+            [header.name]: (_a = header.value) !== null && _a !== void 0 ? _a : '',
+        });
+    }, {});
+}
+exports.headerArrayToRecord = headerArrayToRecord;
 function calculateTotalTimeSeconds(startTimeMillis, endTimeMillis) {
     return (endTimeMillis - startTimeMillis) / 1000;
 }

package/commands/tests/tests_cmds/run.js

@@ -61,11 +61,6 @@ exports.builder = (yargs) => {
         describe: 'Workspace to run against',
         nargs: 1,
         type: 'string',
-    })
-        .option(constants_1.CommandArgEnableLink, {
-        describe: 'Enable usage of mabl Link for test run. For local CLI runs link agent label set in the environment is ignored.',
-        type: 'boolean',
-        hidden: true,
     })
         .option(constants_1.CommandArgEnvironmentId, {
         alias: constants_1.CommandArgAliases.EnvironmentId,
@@ -186,11 +181,18 @@ exports.builder = (yargs) => {
         nargs: 1,
         choices: constants_1.ValidBrowserTypesForLocalRuns,
         hidden: true,
+    })
+        .option(constants_1.CommandArgUseTestExecutionProxy, {
+        describe: 'Route test HTTP traffic through a local proxy',
+        type: 'boolean',
+        hidden: true,
     })
         .check((argv) => {
         (0, testsUtil_1.validateRunCommandWithLabels)(argv[constants_1.CommandArgId], argv[constants_1.CommandArgLabelsInclude], argv[constants_1.CommandArgLabelsExclude], argv[constants_1.CommandArgTestRunId], argv[constants_1.CommandArgFromPlanId], true, argv[constants_1.CommandArgTestFile]);
-        if (argv[constants_1.CommandArgDataTableId] && !argv[constants_1.CommandArgId]) {
-            throw new Error(`The ${constants_1.CommandArgDataTableId} option can only be used with the ${constants_1.CommandArgId} option`);
+        if (argv[constants_1.CommandArgDataTableId] &&
+            !argv[constants_1.CommandArgId] &&
+            !argv[constants_1.CommandArgFromPlanId]) {
+            throw new Error(`The ${constants_1.CommandArgDataTableId} option can only be used with the ${constants_1.CommandArgId} or the ${constants_1.CommandArgFromPlanId} option`);
         }
         if (argv[constants_1.CommandArgDataTableId] && argv[constants_1.CommandArgScenarioId]) {
             throw new Error(`The ${constants_1.CommandArgScenarioId} option cannot be used with the ${constants_1.CommandArgDataTableId} option`);
@@ -245,7 +247,7 @@ async function run(parsed) {
         dataTableVariables: scenario,
         disableIsolation: parsed[constants_1.CommandArgBrowserDisableIsolation],
         enableExtensions: parsed[constants_1.CommandArgBrowserEnableExtensions],
-        enableLink: parsed[constants_1.CommandArgEnableLink],
+        enableLink: false,
         environmentId: parsed[constants_1.CommandArgEnvironmentId],
         extraHttpHeaders,
         filterHttpRequests: false,
@@ -263,6 +265,7 @@ async function run(parsed) {
         testFile: parsed[constants_1.CommandArgTestFile],
         testId: parsed.id,
         url: parsed.url,
+        useTestExecutionProxy: parsed[constants_1.CommandArgUseTestExecutionProxy],
         userAgent: parsed[constants_1.CommandArgUserAgent],
         usingDataTableId: parsed[constants_1.CommandArgDataTableId],
         width: parsed.width,
@@ -280,10 +283,11 @@ async function run(parsed) {
         });
     }
     await (0, runUtils_1.logTestResults)(results, parsed, commandStartTime, generateRunCommandTemplate(parsed, results));
-    if (!results.success && !testRunnerConfig.keepBrowserOpen) {
-        process.exit(1);
+    if (!testRunnerConfig.keepBrowserOpen) {
+        if (!results.success) {
+            process.exit(1);
+        }
     }
-    return 'done';
 }
 exports.run = run;
 function generateRunCommandTemplate(parsed, testResults) {