@mablhq/mabl-cli 1.12.33 → 1.12.38

package/browserLauncher/browserLauncherFactory.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserLauncherFactory = void 0;
 const puppeteerBrowserLauncher_1 = require("./puppeteerBrowserLauncher/puppeteerBrowserLauncher");
@@ -6,6 +9,7 @@ const playwrightBrowserLauncher_1 = require("./playwrightBrowserLauncher/playwri
 const runnerType_1 = require("./runnerType");
 const logUtils_1 = require("../util/logUtils");
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
+const chalk_1 = __importDefault(require("chalk"));
 class BrowserLauncherFactory {
     static getRunnerFromEnvironment() {
         var _a;
@@ -16,10 +20,10 @@ class BrowserLauncherFactory {
         const runner = runnerFromEnv ? runnerFromEnv : runnerType;
         loggerFunc = loggerFunc !== null && loggerFunc !== void 0 ? loggerFunc : ((line) => logUtils_1.logCliOutput(loggingProvider_1.LogLevel.Info, line));
         if (runner === runnerType_1.RunnerType.Playwright) {
-            loggerFunc('Browser launcher: Playwright');
+            loggerFunc(chalk_1.default.cyan(`Browser launcher:`, chalk_1.default.magenta('Playwright')));
             return new playwrightBrowserLauncher_1.PlaywrightBrowserLauncher();
         }
-        loggerFunc('Browser launcher: Puppeteer');
+        loggerFunc(chalk_1.default.cyan(`Browser launcher:`, chalk_1.default.magenta('Puppeteer')));
         return new puppeteerBrowserLauncher_1.PuppeteerBrowserLauncher();
     }
 }

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -31,6 +31,7 @@ class PlaywrightBrowserLauncher {
             viewport,
             acceptDownloads: true,
             httpCredentials: options.credentials,
+            extraHTTPHeaders: options.extraHttpHeaders,
             isMobile: (_a = options.defaultDeviceDescriptor) === null || _a === void 0 ? void 0 : _a.isMobile,
             deviceScaleFactor: (_b = options.defaultDeviceDescriptor) === null || _b === void 0 ? void 0 : _b.deviceScaleFactor,
             hasTouch: (_c = options.defaultDeviceDescriptor) === null || _c === void 0 ? void 0 : _c.hasTouch,

package/browserLauncher/playwrightBrowserLauncher/playwrightHttpResponse.js

@@ -19,5 +19,8 @@ class PlaywrightHttpResponse {
     url() {
         return this.response.url();
     }
+    json() {
+        return this.response.json();
+    }
 }
 exports.PlaywrightHttpResponse = PlaywrightHttpResponse;

package/browserLauncher/puppeteerBrowserLauncher/puppeteerHttpResponse.js

@@ -20,5 +20,8 @@ class PuppeteerHttpResponse {
     request() {
         return new puppeteerHttpRequest_1.PuppeteerHttpRequest(this.response.request(), this.parentPage);
     }
+    json() {
+        return this.response.json();
+    }
 }
 exports.PuppeteerHttpResponse = PuppeteerHttpResponse;

package/commands/tests/testsUtil.js

@@ -134,11 +134,12 @@ async function createBrowserWithAuthedExtension(accessToken, browserWidth, brows
 }
 exports.createBrowserWithAuthedExtension = createBrowserWithAuthedExtension;
 async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    const { defaultDeviceDescriptor, ignoreDefaultArgs, runnerType, loggerFunc } = options || {};
+    const { defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, } = options || {};
     let browser;
     try {
         browser = await maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, {
             defaultDeviceDescriptor,
+            extraHttpHeaders,
             ignoreDefaultArgs,
             runnerType,
             loggerFunc,
@@ -161,10 +162,11 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
     return browser;
 }
 function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    const { defaultDeviceDescriptor, ignoreDefaultArgs, runnerType, loggerFunc } = options || {};
+    const { defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, } = options || {};
     return browserLauncher_1.BrowserLauncherFactory.createRunner(runnerType, loggerFunc).launch({
         defaultDeviceDescriptor,
         executablePath: chromePath,
+        extraHttpHeaders,
         headless,
         args: launchArgs,
         ignoreDefaultArgs,
@@ -195,7 +197,7 @@ function removeTempBrowserPreferencesDirectory(tempDirPath) {
     }
 }
 async function createBrowser(browserWidth, browserHeight, headless, containerTesting, tempBrowserPreferencesDirectory, options) {
-    const { credentials, browserPath, disableIsolation, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, } = options || {};
+    const { credentials, browserPath, disableIsolation, extraHttpHeaders, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, } = options || {};
     const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : findChrome();
     if (!chromePath.length) {
         messaging_1.mablEventEmitter.log(chalk.yellow('Could not find a local install of Chrome to use, please ensure you have it installed and try again'));
@@ -220,6 +222,7 @@ async function createBrowser(browserWidth, browserHeight, headless, containerTes
     }
     const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, {
         defaultDeviceDescriptor,
+        extraHttpHeaders,
         ignoreDefaultArgs,
         runnerType,
         loggerFunc,

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

@@ -237,7 +237,7 @@ async function getJourneysForLabels(workspaceId, branchName, branchChangesOnly,
         organization_id: workspaceId,
         include_labels: labelsInclude,
         exclude_labels: labelsExclude,
-        source_control_tag: branchName,
+        branch: branchName,
         branch_changes_only: branchChangesOnly,
     });
     switch (journeys.length) {

package/commands/tests/tests_cmds/run.js

@@ -145,20 +145,37 @@ exports.builder = (yargs) => {
         describe: 'Enable browser extensions on [Chrome]',
         default: false,
         type: 'boolean',
+    })
+        .option(constants_1.CommandArgHttpHeaders, {
+        describe: 'Space delimited HTTP headers added to browser requests (e.g. "x-header:foo")',
+        type: 'array',
     })
         .option(constants_1.CommandArgTestInteractionSpeed, {
         describe: 'Set the speed that mabl interacts with webpages. Overrides test run settings if specified.',
         type: 'string',
         choices: Object.keys(mablApi_1.JourneyParameters.PageLoadWaitEnum).map((pageLoadWait) => pageLoadWait.toLowerCase()),
     })
-        .check((argv) => 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]));
+        .check((argv) => {
+        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]);
+        const httpHeaders = argv[constants_1.CommandArgHttpHeaders];
+        util_1.validateArrayInputs(httpHeaders, 'HTTP headers must be SPACE delimited, e.g. "--http-headers "foo:bar" "baz:qux"');
+        argv[constants_1.CommandArgHttpHeaders] = util_1.validateValuePairInputs('HTTP header', httpHeaders);
+        return true;
+    });
 };
 const exitCodeOnError = 1;
 exports.handler = util_1.failWrapper(run, exitCodeOnError);
 async function run(parsed) {
-    var _a, _b;
+    var _a, _b, _c;
     const commandStartTime = Date.now();
     const workspaceId = (_a = parsed['workspace-id']) !== null && _a !== void 0 ? _a : (_b = cliConfigProvider_1.CliConfigProvider.getWorkspace()) === null || _b === void 0 ? void 0 : _b.id;
+    const extraHttpHeaders = {};
+    ((_c = parsed['http-headers']) !== null && _c !== void 0 ? _c : []).forEach((header) => {
+        const headerParts = header.split(':');
+        if (headerParts.length === 2 && headerParts[0] && headerParts[1]) {
+            extraHttpHeaders[headerParts[0].toLowerCase()] = headerParts[1];
+        }
+    });
     const testRunnerConfig = {
         _cliCreated: true,
         branchName: parsed['mabl-branch'],
@@ -174,6 +191,7 @@ async function run(parsed) {
         ignoreCertificateErrors: parsed[constants_1.CommandArgBrowserIgnoreCertificateErrors],
         interactionSpeed: parsed[constants_1.CommandArgTestInteractionSpeed],
         enableExtensions: parsed[constants_1.CommandArgBrowserEnableExtensions],
+        extraHttpHeaders,
         keepBrowserOpen: parsed['keep-browser-open'],
         labelsExclude: parsed['exclude-labels'],
         labelsInclude: parsed.labels,