@mablhq/mabl-cli 1.25.5 → 1.26.0

package/Globals.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Globals = void 0;
+class Globals {
+    static getFindOverallTimeoutMs() {
+        return Globals.findOverallTimeoutMs;
+    }
+    static setFindOverallTimeoutMs(timeout) {
+        Globals.findOverallTimeoutMs = timeout;
+    }
+    static getPlaywrightInteractionWarningMs() {
+        return Globals.playwrightInteractionWarningMs;
+    }
+    static setPlaywrightInteractionWarningMs(timeout) {
+        Globals.playwrightInteractionWarningMs = timeout;
+    }
+}
+exports.Globals = Globals;
+Globals.findOverallTimeoutMs = 18.5 * 60 * 1000;
+Globals.playwrightInteractionWarningMs = 30 * 1000;

package/api/entities/Browser.js

@@ -4,6 +4,7 @@ exports.Browser = void 0;
 var Browser;
 (function (Browser) {
     Browser["chrome"] = "chrome";
+    Browser["edge"] = "edge";
     Browser["firefox"] = "firefox";
     Browser["internet_explorer"] = "internet_explorer";
     Browser["safari"] = "safari";

package/api/featureSet.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeatureSet = exports.FindImplementationVersion = void 0;
-const runnerType_1 = require("../browserLauncher/runnerType");
+const types_1 = require("../browserLauncher/types");
+const ACCESSIBILITY_CHECK_FEATURE_FLAG = 'accessibility_checks';
 const SMARTER_WAIT_FEATURE_FLAG = 'smarter_wait';
 var FindImplementationVersion;
 (function (FindImplementationVersion) {
@@ -13,12 +14,15 @@ class FeatureSet {
         this.featureFlags = featureFlags;
     }
     getRunnerType() {
-        return runnerType_1.RunnerType.Playwright;
+        return types_1.RunnerType.Playwright;
     }
     getFindImplementationVersion() {
         return this.featureFlags.has(SMARTER_WAIT_FEATURE_FLAG)
             ? FindImplementationVersion.SmartFind
             : FindImplementationVersion.V1;
     }
+    hasAccessibilityChecksEnabled() {
+        return this.featureFlags.has(ACCESSIBILITY_CHECK_FEATURE_FLAG);
+    }
 }
 exports.FeatureSet = FeatureSet;

package/api/mablApiClient.js

@@ -329,6 +329,14 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
             throw toApiError(`Failed to get account`, error);
         }
     }
+    async getAccountByWorkspaceId(workspaceId) {
+        try {
+            return await this.makeGetRequest(`${this.baseApiUrl}/organizations/${workspaceId}/account`);
+        }
+        catch (error) {
+            throw toApiError(`Failed to get account from workspace id`, error);
+        }
+    }
     async getApiKeyDetails() {
         try {
             return await this.makeGetRequest(`${this.baseApiUrl}/apiKeys/self`);
@@ -698,6 +706,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     async failJourneyRun(journeyRunId, cause) {
         try {
             const response = await this.makePatchRequest(`${this.baseApiUrl}/journeyRuns/${journeyRunId}`, {
+                functionally_completed: false,
                 status: mablApi_1.JourneyRun.StatusEnum.Failed,
                 status_cause: cause,
             });
@@ -726,8 +735,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     }
     async getEffectiveFeaturesByWorkspaceId(workspaceId) {
         try {
-            const workspace = await this.getWorkspace(workspaceId);
-            const account = await this.getAccount(workspace.account_id);
+            const account = await this.getAccountByWorkspaceId(workspaceId);
             const features = account.effective_features
                 ? new Set(account.effective_features)
                 : new Set();

package/browserLauncher/browserLauncherFactory.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserLauncherFactory = void 0;
 const playwrightBrowserLauncher_1 = require("./playwrightBrowserLauncher/playwrightBrowserLauncher");
-const runnerType_1 = require("./runnerType");
+const types_1 = require("./types");
 const logUtils_1 = require("../util/logUtils");
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const chalk_1 = __importDefault(require("chalk"));
@@ -14,12 +14,12 @@ class BrowserLauncherFactory {
         var _a;
         return (_a = process.env.MABL_RUNNER) === null || _a === void 0 ? void 0 : _a.toLowerCase();
     }
-    static createRunner(runnerType = runnerType_1.RunnerType.Playwright, loggerFunc) {
+    static createRunner(runnerType = types_1.RunnerType.Playwright, loggerFunc) {
         const runnerFromEnv = BrowserLauncherFactory.getRunnerFromEnvironment();
         const runner = runnerFromEnv ? runnerFromEnv : runnerType;
         loggerFunc =
             loggerFunc !== null && loggerFunc !== void 0 ? loggerFunc : ((line) => (0, logUtils_1.logCliOutput)(loggingProvider_1.LogLevel.Info, line));
-        if (runner === runnerType_1.RunnerType.Playwright) {
+        if (runner === types_1.RunnerType.Playwright) {
             loggerFunc(chalk_1.default.cyan(`Browser launcher:`, chalk_1.default.magenta('Playwright')));
             return new playwrightBrowserLauncher_1.PlaywrightBrowserLauncher();
         }

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -31,9 +31,9 @@ const events_1 = __importDefault(require("events"));
 const playwright = __importStar(require("@playwright/test"));
 const browserLauncher_1 = require("../browserLauncher");
 const playwrightPage_1 = require("./playwrightPage");
+const types_1 = require("../types");
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const runnerType_1 = require("../runnerType");
 class PlaywrightBrowser extends events_1.default {
     constructor(defaultContext, downloadDirectory, browserWSEndpoint, disableFocusEmulation) {
         super();
@@ -61,7 +61,7 @@ class PlaywrightBrowser extends events_1.default {
         return browser;
     }
     getRunnerType() {
-        return runnerType_1.RunnerType.Playwright;
+        return types_1.RunnerType.Playwright;
     }
     makeCdpCall(method, paramArgs) {
         return this.cdpSession.send(method, paramArgs);

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightBrowserLauncher = void 0;
 const test_1 = require("@playwright/test");
+const browserTypes_1 = require("../../commands/browserTypes");
+const loggingProvider_1 = require("../../providers/logging/loggingProvider");
 const playwrightBrowser_1 = require("./playwrightBrowser");
 const BROWSER_LAUNCH_TIMEOUT_MS = 60000;
 class PlaywrightBrowserLauncher {
@@ -18,13 +20,23 @@ class PlaywrightBrowserLauncher {
             }
             :
                 null;
+        if (!options.userDataDir) {
+            loggingProvider_1.logger.error('User data directory is required to launch a persistent chromium context and was not provided with LaunchOptions [{}]', options);
+            throw new Error('User data directory is required to launch a persistent chromium context');
+        }
+        if (!options.downloadPath) {
+            loggingProvider_1.logger.error('Download path is required to launch a persistent chromium context and was not provided with LaunchOptions [{}]', options);
+            throw new Error('Download path is required to launch a persistent chromium context and was not provided with LaunchOptions');
+        }
         const defaultContext = await test_1.chromium.launchPersistentContext(options.userDataDir, {
             acceptDownloads: true,
             args: options.args,
             bypassCSP: options.bypassContentSecurityPolicy,
+            channel: browserTypes_1.SupportedBrowserTypeProperties[options.browserType]
+                .browserReleaseChannel,
             deviceScaleFactor: (_a = options.defaultDeviceDescriptor) === null || _a === void 0 ? void 0 : _a.deviceScaleFactor,
             downloadsPath: options.downloadPath,
-            executablePath: options.executablePath,
+            executablePath: options.browserPath,
             extraHTTPHeaders: options.extraHttpHeaders,
             hasTouch: (_b = options.defaultDeviceDescriptor) === null || _b === void 0 ? void 0 : _b.hasTouch,
             headless: options.headless,

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -304,10 +304,28 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
         const result = await this.element.evaluate((el, attributeName) => el.getAttribute(attributeName), attributeName);
         return (0, pureUtil_1.isNullish)(result) ? undefined : result;
     }
+    async getElementText() {
+        const innerText = await this.getInnerText();
+        return innerText ? innerText : this.getSlotText();
+    }
     async getInnerText() {
         const result = await this.element.evaluate((el) => el.innerText);
         return (0, pureUtil_1.isNullish)(result) ? undefined : result;
     }
+    async getSlotText() {
+        const result = await this.element.evaluate((el) => {
+            const slots = el.querySelectorAll('slot');
+            if (slots.length !== 1) {
+                return '';
+            }
+            const textNode = slots
+                .item(0)
+                .assignedNodes()
+                .find((node) => node.nodeType === Node.TEXT_NODE);
+            return textNode === null || textNode === void 0 ? void 0 : textNode.data;
+        });
+        return (0, pureUtil_1.isNullish)(result) ? undefined : result;
+    }
     getActionTimeout(options) {
         var _a;
         const defaultTimeout = (options === null || options === void 0 ? void 0 : options.trial)

package/browserLauncher/types.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WaitForOptions = exports.LifecycleEvent = exports.DefaultTimeouts = void 0;
+exports.WaitForOptions = exports.LifecycleEvent = exports.RunnerType = exports.DefaultTimeouts = void 0;
 class DefaultTimeouts {
 }
 exports.DefaultTimeouts = DefaultTimeouts;
 DefaultTimeouts.defaultTrialTimeoutMs = 5000;
 DefaultTimeouts.defaultWaitTimeoutMs = 5000;
 DefaultTimeouts.defaultActionTimeoutMs = 0;
+var RunnerType;
+(function (RunnerType) {
+    RunnerType["Playwright"] = "playwright";
+})(RunnerType = exports.RunnerType || (exports.RunnerType = {}));
 var LifecycleEvent;
 (function (LifecycleEvent) {
     LifecycleEvent["DomContentLoaded"] = "domcontentloaded";

package/commands/browserTypes.js

@@ -1,10 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowserTypes = void 0;
-var BrowserTypes;
-(function (BrowserTypes) {
-    BrowserTypes["Chrome"] = "chrome";
-    BrowserTypes["Firefox"] = "firefox";
-    BrowserTypes["InternetExplorer"] = "internet_explorer";
-    BrowserTypes["Safari"] = "safari";
-})(BrowserTypes = exports.BrowserTypes || (exports.BrowserTypes = {}));
+exports.DefaultBrowserProperties = exports.SupportedBrowserTypeProperties = exports.BrowserType = void 0;
+var BrowserType;
+(function (BrowserType) {
+    BrowserType["Chrome"] = "chrome";
+    BrowserType["Edge"] = "edge";
+    BrowserType["Firefox"] = "firefox";
+    BrowserType["InternetExplorer"] = "internet_explorer";
+    BrowserType["Safari"] = "safari";
+})(BrowserType = exports.BrowserType || (exports.BrowserType = {}));
+exports.SupportedBrowserTypeProperties = {
+    chrome: { browserName: 'chrome', browserReleaseChannel: 'chrome' },
+    edge: { browserName: 'edge', browserReleaseChannel: 'msedge' },
+    firefox: { browserName: 'firefox', browserReleaseChannel: 'firefox' },
+    safari: {
+        browserName: 'safari',
+        browserReleaseChannel: 'webkit',
+    },
+};
+exports.DefaultBrowserProperties = exports.SupportedBrowserTypeProperties.chrome;

package/commands/constants.js

@@ -107,10 +107,11 @@ exports.DefaultOutputFormatChoices = [
     OutputFormats.Yaml,
 ];
 exports.DefaultBranchName = 'master';
-exports.DefaultBrowserType = browserTypes_1.BrowserTypes.Chrome;
+exports.DefaultBrowserType = browserTypes_1.BrowserType.Chrome;
 exports.BrowserTypeSelections = [
-    browserTypes_1.BrowserTypes.Chrome,
-    browserTypes_1.BrowserTypes.Firefox,
-    browserTypes_1.BrowserTypes.InternetExplorer,
-    browserTypes_1.BrowserTypes.Safari,
+    browserTypes_1.BrowserType.Chrome,
+    browserTypes_1.BrowserType.Edge,
+    browserTypes_1.BrowserType.Firefox,
+    browserTypes_1.BrowserType.InternetExplorer,
+    browserTypes_1.BrowserType.Safari,
 ].map((browser) => browser.toString());

package/commands/environments/environments_cmds/create.js

@@ -84,6 +84,9 @@ function addUpdateEnvCommands(argv) {
         return true;
     })
         .coerce('variables', (variables) => {
+        if (variables.length === 0) {
+            return undefined;
+        }
         (0, util_1.validateArrayInputs)(variables, 'Variables must be SPACE delimited, e.g. --variables foo:bar baz:qux');
         variables = (0, util_1.validateValuePairInputs)('Variable', variables);
         return variables.reduce((variablesObject, item) => {

package/commands/tests/testsUtil.js

@@ -27,25 +27,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBasicHttpAuthenticationCredentials = exports.generateChromiumPreferencesFile = exports.logTestInfoIfPresent = exports.milliSecondsToSeconds = exports.calculateTotalTimeSeconds = exports.extractTestRunConfig = exports.pullDownTestRunConfig = exports.validateRunCommandWithLabels = exports.validateRunEditCommand = exports.downloadUploadFile = exports.sleep = exports.editTheTest = exports.runTheTest = exports.prepareTrainerForSplitPlayback = exports.createTrainingSession = exports.cleanUpInitialPages = exports.getExtensionBackgroundPageWithCliTool = exports.createBrowserForExecutionEngine = exports.addExecutionEngineLaunchArgs = exports.createBrowser = exports.prepareChromePreferencesDirectory = exports.findChrome = exports.searchForChrome = exports.getFinalUrl = exports.getTempChromePrefDirectory = void 0;
-const os = __importStar(require("os"));
+const async_retry_1 = __importDefault(require("async-retry"));
+const axios_1 = __importDefault(require("axios"));
+const cli_table3_1 = __importDefault(require("cli-table3"));
 const fs = __importStar(require("fs-extra"));
+const os = __importStar(require("os"));
 const path = __importStar(require("path"));
-const constants_1 = require("../constants");
-const messaging_1 = require("../../core/messaging/messaging");
-const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
-const configKeys_1 = require("../config/config_cmds/configKeys");
+const stream_1 = require("stream");
+const browserLauncher_1 = require("../../browserLauncher/browserLauncher");
 const trainingSessionActions_1 = require("../../core/messaging/actions/trainingSessionActions");
-const async_retry_1 = __importDefault(require("async-retry"));
+const logLineMessaging_1 = require("../../core/messaging/logLineMessaging");
+const messaging_1 = require("../../core/messaging/messaging");
 const env_1 = require("../../env/env");
-const axios_1 = __importDefault(require("axios"));
-const httpUtil_1 = require("../../util/httpUtil");
+const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
-const cli_table3_1 = __importDefault(require("cli-table3"));
-const logLineMessaging_1 = require("../../core/messaging/logLineMessaging");
+const httpUtil_1 = require("../../util/httpUtil");
 const resourceUtil_1 = require("../../util/resourceUtil");
+const configKeys_1 = require("../config/config_cmds/configKeys");
+const constants_1 = require("../constants");
 const mobileEmulationUtil_1 = require("./mobileEmulationUtil");
-const browserLauncher_1 = require("../../browserLauncher/browserLauncher");
-const stream_1 = require("stream");
 const trainerUtil_1 = require("./tests_cmds/trainerUtil");
 const chalk = require('chalk');
 const chromeFinder = require('chrome-launcher/dist/chrome-finder');
@@ -61,6 +61,7 @@ const baseExecutionEngineLaunchArgs = [
     '--v=0',
     '--enable-features=NetworkService,NetworkServiceInProcess',
     '--disable-features=site-per-process',
+    '--disable-component-update',
 ];
 const ExecutionEngineFakeAudioFilePath = '/opt/media/mabl_test_audio.wav';
 const ExecutionEngineFakeVideoFilePath = '/opt/media/mabl_test_pattern.y4m';
@@ -105,42 +106,23 @@ async function findChrome() {
     return chromePath;
 }
 exports.findChrome = findChrome;
-async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    var _a;
-    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, disableFocusEmulation, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
-    let browser;
-    const proxyServer = (_a = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http.test
-        .proxyHost) === null || _a === void 0 ? void 0 : _a.href;
-    let proxy;
-    if (proxyServer) {
-        proxy = {
-            server: proxyServer,
+async function launchBrowserInstance(launchArgs, userDataDir, headless, credentials, options) {
+    const optionsProxy = await maybeGetProxyOptions(options);
+    if (optionsProxy) {
+        options = {
+            ...options,
+            proxy: optionsProxy,
         };
     }
+    let browser;
     try {
-        browser = await maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, {
-            bypassContentSecurityPolicy,
-            defaultDeviceDescriptor,
-            disableFocusEmulation,
-            extraHttpHeaders,
-            ignoreDefaultArgs,
-            runnerType,
-            loggerFunc,
-            proxy,
-            userAgent,
-        });
+        browser = await maybeLaunchBrowser(launchArgs, userDataDir, headless, credentials, options);
     }
     catch (error) {
         if (error.message.includes('Running as root without --no-sandbox is not supported')) {
             launchArgs.push('--no-sandbox');
             messaging_1.mablEventEmitter.log('Unable to initialize browser with standard settings, attempting to run with --no-sandbox setting', Date.now(), logLineMessaging_1.LogLineColor.yellow);
-            return maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, {
-                bypassContentSecurityPolicy,
-                defaultDeviceDescriptor,
-                ignoreDefaultArgs,
-                proxy,
-                runnerType,
-            }).catch((error) => {
+            return maybeLaunchBrowser(launchArgs, userDataDir, headless, credentials, options).catch((error) => {
                 messaging_1.mablEventEmitter.log('Browser launch failed', Date.now(), logLineMessaging_1.LogLineColor.red);
                 messaging_1.mablEventEmitter.log(error.message);
             });
@@ -150,22 +132,31 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
     }
     return browser;
 }
-function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, disableFocusEmulation, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, proxy, userAgent, } = options || {};
-    return browserLauncher_1.BrowserLauncherFactory.createRunner(runnerType, loggerFunc).launch({
-        bypassContentSecurityPolicy,
-        defaultDeviceDescriptor,
-        disableFocusEmulation,
-        executablePath: chromePath,
-        extraHttpHeaders,
+async function maybeGetProxyOptions(options) {
+    var _a;
+    const proxyServer = (_a = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http.test
+        .proxyHost) === null || _a === void 0 ? void 0 : _a.href;
+    let optionsProxy;
+    if (options === null || options === void 0 ? void 0 : options.proxy) {
+        optionsProxy = {
+            server: options.proxy.server,
+        };
+    }
+    else if (proxyServer) {
+        optionsProxy = {
+            server: proxyServer,
+        };
+    }
+    return optionsProxy;
+}
+function maybeLaunchBrowser(launchArgs, userDataDir, headless, credentials, options) {
+    return browserLauncher_1.BrowserLauncherFactory.createRunner(options === null || options === void 0 ? void 0 : options.runnerType, options === null || options === void 0 ? void 0 : options.loggerFunc).launch({
+        ...options,
         headless,
         args: launchArgs,
-        ignoreDefaultArgs,
         userDataDir,
         downloadPath: createDownloadDirectory(),
         credentials,
-        proxy,
-        userAgent,
     });
 }
 async function prepareChromePreferencesDirectory(browserPreferences) {
@@ -190,12 +181,8 @@ function removeTempBrowserPreferencesDirectory(tempDirPath) {
     }
 }
 async function createBrowser(browserWidth, browserHeight, headless, containerTesting, tempBrowserPreferencesDirectory, options) {
-    const { bypassContentSecurityPolicy, credentials, browserPath, disableFocusEmulation, disableIsolation, extraHttpHeaders, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, resourcesDirectoryOverride, proxy, userAgent, } = options || {};
-    const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : (await 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'));
-        throw new Error('Chrome not found error');
-    }
+    var _a;
+    const { credentials, disableIsolation, ignoreCertificateErrors, emulationConfig, enableExtensions, resourcesDirectoryOverride, } = options || {};
     const disableFeaturesFlags = [];
     const launchArgs = [];
     if (containerTesting) {
@@ -216,16 +203,11 @@ async function createBrowser(browserWidth, browserHeight, headless, containerTes
     if (enableExtensions) {
         ignoreDefaultArgs = ['--disable-extensions'];
     }
-    const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, {
-        bypassContentSecurityPolicy,
+    const maybeBrowser = await launchBrowserInstance(launchArgs, tempBrowserPreferencesDirectory, headless, credentials, {
+        ...options,
         defaultDeviceDescriptor,
-        disableFocusEmulation,
-        extraHttpHeaders,
         ignoreDefaultArgs,
-        runnerType,
-        loggerFunc,
-        proxy,
-        userAgent: userAgent !== null && userAgent !== void 0 ? userAgent : emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent,
+        userAgent: (_a = options === null || options === void 0 ? void 0 : options.userAgent) !== null && _a !== void 0 ? _a : emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent,
     });
     if (!maybeBrowser) {
         throw new Error('Unable to start Chrome session');
@@ -265,15 +247,18 @@ function addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, em
 }
 exports.addExecutionEngineLaunchArgs = addExecutionEngineLaunchArgs;
 async function createBrowserForExecutionEngine(browserWidth, browserHeight, headless, tempBrowserPreferencesDirectory, proxyInfo, options) {
-    const { credentials, browserPath, emulationConfig, runnerType, loggerFunc } = options || {};
-    const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : (await findChrome());
-    const { launchArgs, defaultDeviceDescriptor } = addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, emulationConfig);
-    const maybeBrowser = await maybeLaunchBrowser(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, {
-        defaultDeviceDescriptor,
-        runnerType,
-        loggerFunc,
-        userAgent: emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent,
-    });
+    const { credentials, deviceEmulationConfig, userAgent } = options;
+    if (deviceEmulationConfig && !userAgent) {
+        options = {
+            ...options,
+            userAgent: deviceEmulationConfig.device_config.user_agent,
+        };
+    }
+    const { launchArgs, defaultDeviceDescriptor } = addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, deviceEmulationConfig);
+    if (defaultDeviceDescriptor) {
+        options = { ...options, defaultDeviceDescriptor };
+    }
+    const maybeBrowser = await maybeLaunchBrowser(launchArgs, tempBrowserPreferencesDirectory, headless, credentials, options);
     if (!maybeBrowser) {
         throw new Error('Unable to start Chrome session');
     }
@@ -593,7 +578,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, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     const journeyRun = await apiClient.getTestRun(testRunId);
     const planRun = await apiClient.getPlanRun(journeyRun.parent_execution);
     return {
@@ -608,16 +593,15 @@ async function pullDownTestRunConfig(testRunId, apiClient) {
         deviceEmulation: (_g = journeyRun.journey_parameters) === null || _g === void 0 ? void 0 : _g.device_emulation,
         environmentId: (_j = (_h = journeyRun.journey_parameters) === null || _h === void 0 ? void 0 : _h.deployment) === null || _j === void 0 ? void 0 : _j.environment_id,
         filterHttpRequests: false,
-        journeyUserDefinedVariables: (_l = (_k = journeyRun.journey) === null || _k === void 0 ? void 0 : _k.variables) === null || _l === void 0 ? void 0 : _l.inputs,
-        importedVariables: (_m = journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.imported_variables,
-        pageLoadWait: (_o = journeyRun.journey_parameters) === null || _o === void 0 ? void 0 : _o.page_load_wait,
-        testId: (_p = journeyRun.journey) === null || _p === void 0 ? void 0 : _p.invariant_id,
-        url: (_r = (_q = journeyRun.journey_parameters) === null || _q === void 0 ? void 0 : _q.deployment) === null || _r === void 0 ? void 0 : _r.uri,
+        importedVariables: (_k = journeyRun.journey_parameters) === null || _k === void 0 ? void 0 : _k.imported_variables,
+        pageLoadWait: (_l = journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.page_load_wait,
+        testId: (_m = journeyRun.journey) === null || _m === void 0 ? void 0 : _m.invariant_id,
+        url: (_p = (_o = journeyRun.journey_parameters) === null || _o === void 0 ? void 0 : _o.deployment) === null || _p === void 0 ? void 0 : _p.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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     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)
@@ -634,11 +618,10 @@ async function extractTestRunConfig(executionMessage, apiClient) {
         environmentId: (_k = (_j = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _j === void 0 ? void 0 : _j.deployment) === null || _k === void 0 ? void 0 : _k.environment_id,
         filterHttpRequests: true,
         importedVariables: (_l = journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.imported_variables,
-        journeyUserDefinedVariables: (_o = (_m = journeyRun.journey) === null || _m === void 0 ? void 0 : _m.variables) === null || _o === void 0 ? void 0 : _o.inputs,
-        pageLoadWait: (_p = journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.page_load_wait,
+        pageLoadWait: (_m = journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.page_load_wait,
         runnerType: maybeRunnerType,
-        testId: (_q = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _q === void 0 ? void 0 : _q.invariant_id,
-        url: (_s = (_r = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _r === void 0 ? void 0 : _r.deployment) === null || _s === void 0 ? void 0 : _s.uri,
+        testId: (_o = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _o === void 0 ? void 0 : _o.invariant_id,
+        url: (_q = (_p = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.deployment) === null || _q === void 0 ? void 0 : _q.uri,
     };
 }
 exports.extractTestRunConfig = extractTestRunConfig;

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

@@ -56,9 +56,9 @@ exports.builder = (yargs) => {
     })
         .option(constants_1.CommandArgBrowsers, {
         alias: constants_1.CommandArgAliases.Browsers,
-        describe: 'Space delimited browsers to test against (e.g. "chrome firefox")',
+        describe: 'Space delimited browsers to test against (e.g. "chrome edge firefox")',
         type: 'array',
-        default: constants_1.DefaultBrowserType.toString(),
+        default: constants_1.DefaultBrowserType,
         choices: constants_1.BrowserTypeSelections,
         demand: 'Choose at least one browser to run on',
     })

package/commands/tests/tests_cmds/run.js

@@ -7,6 +7,7 @@ const constants_1 = require("../../constants");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const mablApi_1 = require("../../../mablApi");
 const reporter_1 = require("../../../reporters/reporter");
+const browserTypes_1 = require("../../browserTypes");
 const chalk = require('chalk');
 const execution = require('../../../execution/index');
 exports.command = `run`;
@@ -188,6 +189,7 @@ async function run(parsed) {
         _cliCreated: true,
         basicAuthCredentialsId: parsed[constants_1.CommandArgBasicAuthCredentials],
         branchName: parsed['mabl-branch'],
+        browserType: browserTypes_1.BrowserType.Chrome,
         credentialsId: parsed['credentials-id'],
         disableIsolation: parsed[constants_1.CommandArgBrowserDisableIsolation],
         enableExtensions: parsed[constants_1.CommandArgBrowserEnableExtensions],