@mablhq/mabl-cli 1.22.1 → 1.25.5

package/README.md

@@ -345,10 +345,10 @@ mabl config delete http.sslVerify
 
 ## Installation Troubleshooting
 
-If you receive the following error message, you need to ensure you have Node 12+
+If you receive the following error message, you need to ensure you have Node 14+
 installed.
 
 ```bash
-npm WARN notsup Unsupported engine for @mablhq/mabl-cli@0.1.13: wanted: {"node":">= 12.0.0"} (current: {"node":"8.15.1","npm":"6.13.4"})
+npm WARN notsup Unsupported engine for @mablhq/mabl-cli@0.1.13: wanted: {"node":">= 14.0.0"} (current: {"node":"8.15.1","npm":"6.13.4"})
 npm WARN notsup Not compatible with your version of node/npm: @mablhq/mabl-cli@0.1.13
 ```

package/api/basicApiClient.js

@@ -59,6 +59,9 @@ class BasicApiClient {
             sslVerify: (_a = options.sslVerify) !== null && _a !== void 0 ? _a : DEFAULT_SSL_VERIFY,
             proxyHost: options.proxyUrl,
         });
+        if (!config.headers) {
+            config.headers = {};
+        }
         config.timeout =
             (_d = (_b = options.requestTimeoutMillis) !== null && _b !== void 0 ? _b : (_c = options.retryConfig) === null || _c === void 0 ? void 0 : _c.requestTimeoutMillis) !== null && _d !== void 0 ? _d : DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS;
         switch (options.authType) {
@@ -87,6 +90,7 @@ class BasicApiClient {
         }
         this.httpRequestConfig = config;
         this.httpClient = axios_1.default.create(config);
+        this.httpClient.defaults.headers.common = { ...config.headers };
         this.retryConfig = options.retryConfig;
         this.debugLogger = (_e = options.debugLogger) !== null && _e !== void 0 ? _e : logUtils_1.logInternal;
     }

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -131,8 +131,10 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
     async boundingBox() {
         return (0, utils_1.mapIfNotNull)(await this.element.boundingBox(), (boundingBox) => boundingBox);
     }
-    async overwriteScrollIntoViewDuringAction(action) {
-        await this.overwriteScrollIntoViewFunction();
+    async maybeOverwriteScrollIntoViewDuringAction(action, options) {
+        if (options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView) {
+            await this.overwriteScrollIntoViewFunction();
+        }
         try {
             return await action();
         }
@@ -140,11 +142,13 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
             throw e;
         }
         finally {
-            await this.resetScrollIntoViewFunction();
+            if (options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView) {
+                await this.resetScrollIntoViewFunction();
+            }
         }
     }
     click(options) {
-        return this.overwriteScrollIntoViewDuringAction(async () => {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => {
             var _a, _b, _c;
             const trial = (_a = options === null || options === void 0 ? void 0 : options.trial) !== null && _a !== void 0 ? _a : false;
             try {
@@ -162,10 +166,12 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
                 }
                 throw error;
             }
+        }, {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
         });
     }
     async doubleClick(options) {
-        return this.overwriteScrollIntoViewDuringAction(async () => {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => {
             var _a, _b;
             try {
                 const trial = (_a = options === null || options === void 0 ? void 0 : options.trial) !== null && _a !== void 0 ? _a : false;
@@ -180,6 +186,8 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
                     (0, logUtils_1.logInternal)(`Action timed out due to navigation timeout. ${error.toString()}`);
                 }
             }
+        }, {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
         });
     }
     async clickablePoint() {
@@ -206,11 +214,13 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
     scrollIntoViewIfNeeded() {
         return this.element.scrollIntoViewIfNeeded();
     }
-    async select(value) {
-        return this.overwriteScrollIntoViewDuringAction(async () => this.element.selectOption(value));
+    async select(value, options) {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => this.element.selectOption(value), {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
+        });
     }
     async type(text, options) {
-        return this.overwriteScrollIntoViewDuringAction(async () => {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => {
             var _a;
             const selectText = (_a = options === null || options === void 0 ? void 0 : options.selectText) !== null && _a !== void 0 ? _a : true;
             if (selectText) {
@@ -220,10 +230,14 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
                 delay: options === null || options === void 0 ? void 0 : options.delay,
                 timeout: 0,
             });
+        }, {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
         });
     }
-    press(key) {
-        return this.overwriteScrollIntoViewDuringAction(async () => this.element.press(key));
+    press(key, options) {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => this.element.press(key), {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
+        });
     }
     getRemoteObjectId() {
         var _a, _b, _c;

package/browserLauncher/playwrightBrowserLauncher/playwrightFrame.js

@@ -200,5 +200,8 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
         const context = await this.getFrameImpl()._utilityContext();
         return new playwrightDom_1.PlaywrightJsHandle(await context.injectedScript(), this.page());
     }
+    isDetached() {
+        return this.frame.isDetached();
+    }
 }
 exports.PlaywrightFrame = PlaywrightFrame;

package/commands/deploy/deploy_cmds/awaitDeploymentCompletion.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwaitDeploymentCompletion = void 0;
 const awaitCompletion_1 = require("../../commandUtil/awaitCompletion");
 const executionResultPresenter_1 = require("./executionResultPresenter");
-const moment = require("moment");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
+const timeUtil_1 = require("../../../util/timeUtil");
 const chalk = require('chalk');
-const momentDurationFormatSetup = require('moment-duration-format');
-momentDurationFormatSetup(moment);
 class AwaitDeploymentCompletion extends awaitCompletion_1.AwaitCompletion {
     constructor(apiClient, exitOnFirstFailure, isSilent) {
         super(apiClient, AwaitDeploymentCompletion.pollingTimeoutMilliseconds, AwaitDeploymentCompletion.pollingIntervalMilliseconds);
@@ -46,9 +44,7 @@ class AwaitDeploymentCompletion extends awaitCompletion_1.AwaitCompletion {
         if (this.isSilent) {
             return;
         }
-        const elapsedTimeString = moment
-            .duration(this.getElapsedMilliseconds(), 'ms')
-            .format('hh:mm:ss', { trim: false });
+        const elapsedTimeString = (0, timeUtil_1.elapsedTimeDurationToString)(this.getElapsedMilliseconds());
         const passed = (_b = (_a = lastEntity.plan_execution_metrics) === null || _a === void 0 ? void 0 : _a.passed) !== null && _b !== void 0 ? _b : 0;
         const failed = (_d = (_c = lastEntity.plan_execution_metrics) === null || _c === void 0 ? void 0 : _c.failed) !== null && _d !== void 0 ? _d : 0;
         const total = (_f = (_e = lastEntity.plan_execution_metrics) === null || _e === void 0 ? void 0 : _e.total) !== null && _f !== void 0 ? _f : 0;

package/commands/deploy/deploy_cmds/create.js

@@ -7,7 +7,6 @@ const mablApi_1 = require("../../../mablApi");
 const util_1 = require("../../commandUtil/util");
 const branches_1 = require("../../commandUtil/branches");
 const awaitDeploymentCompletion_1 = require("./awaitDeploymentCompletion");
-const moment = require("moment");
 const scmContextProvider_1 = require("../../../providers/scmContextProvider");
 const cliConfigProvider_1 = require("../../../providers/cliConfigProvider");
 const configKeys_1 = require("../../config/config_cmds/configKeys");
@@ -16,8 +15,6 @@ const constants_1 = require("../../constants");
 const describe_1 = require("../../commandUtil/describe");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const chalk = require('chalk');
-const momentDurationFormatSetup = require('moment-duration-format');
-momentDurationFormatSetup(moment);
 const CommandArgAwaitCompletion = 'await-completion';
 const CommandArgRebaselineImages = 'rebaseline-images';
 const CommandArgRepositoryUrl = 'repository-url';

package/commands/deploy/deploy_cmds/executionResultPresenter.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionResultPresenter = void 0;
 const change_case_1 = require("change-case");
 const mablApi_1 = require("../../../mablApi");
-const moment = require("moment");
 const cli_table3_1 = __importDefault(require("cli-table3"));
+const timeUtil_1 = require("../../../util/timeUtil");
 const chalk = require('chalk');
-const momentDurationFormatSetup = require('moment-duration-format');
-momentDurationFormatSetup(moment);
 class ExecutionResultPresenter {
     entityToString(results, columnWidth) {
         var _a;
@@ -45,7 +43,7 @@ class ExecutionResultPresenter {
                 planId,
                 '---',
                 statusChalk(this.maybeCapitalize(planRunStatus.toString())),
-                this.summaryToElapsedTime(summary),
+                summaryToElapsedTime(summary),
             ]);
             (_e = summary === null || summary === void 0 ? void 0 : summary.journey_executions) === null || _e === void 0 ? void 0 : _e.forEach((journeyRun) => {
                 var _a, _b, _c, _d;
@@ -61,7 +59,7 @@ class ExecutionResultPresenter {
                     journeyId,
                     journeyBrowser,
                     statusChalk(journeyStatus),
-                    this.journeyRunToElapsedTime(journeyRun),
+                    journeyRunToElapsedTime(journeyRun),
                 ]);
             });
         });
@@ -73,28 +71,6 @@ class ExecutionResultPresenter {
         }
         return;
     }
-    journeyRunToElapsedTime(journeyRun) {
-        let elapsedTimeString = '--:--:--';
-        const startTime = journeyRun.start_time;
-        const stopTime = journeyRun.stop_time;
-        if (startTime && stopTime) {
-            elapsedTimeString = moment
-                .duration(stopTime - startTime, 'ms')
-                .format('hh:mm:ss', { trim: false });
-        }
-        return elapsedTimeString;
-    }
-    summaryToElapsedTime(summary) {
-        let elapsedTimeString = '--:--:--';
-        const startTime = summary.start_time;
-        const stopTime = summary.stop_time;
-        if (startTime && stopTime) {
-            elapsedTimeString = moment
-                .duration(stopTime - startTime, 'ms')
-                .format('hh:mm:ss', { trim: false });
-        }
-        return elapsedTimeString;
-    }
     mapPlanRunStatusToColor(status) {
         switch (status) {
             case mablApi_1.PlanExecutionResult.StatusEnum.Queued:
@@ -132,3 +108,9 @@ class ExecutionResultPresenter {
     }
 }
 exports.ExecutionResultPresenter = ExecutionResultPresenter;
+function journeyRunToElapsedTime(journeyRun) {
+    return (0, timeUtil_1.elapsedTimeToString)(journeyRun.start_time, journeyRun.stop_time);
+}
+function summaryToElapsedTime(summary) {
+    return (0, timeUtil_1.elapsedTimeToString)(summary.start_time, summary.stop_time);
+}

package/commands/tests/testsUtil.js

@@ -26,9 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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.setUpAuthTokenForExtension = exports.createBrowserForExecutionEngine = exports.addExecutionEngineLaunchArgs = exports.createBrowser = exports.prepareChromePreferencesDirectory = exports.createBrowserWithAuthedExtension = exports.findChrome = exports.searchForChrome = exports.getFinalUrl = exports.getTempChromePrefDirectory = void 0;
+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 trainerUtil_1 = require("./tests_cmds/trainer_cmds/trainerUtil");
 const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 const constants_1 = require("../constants");
@@ -47,6 +46,7 @@ const resourceUtil_1 = require("../../util/resourceUtil");
 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');
 const launchUtils = require('chrome-launcher/dist/utils');
@@ -105,38 +105,6 @@ async function findChrome() {
     return chromePath;
 }
 exports.findChrome = findChrome;
-async function createBrowserWithAuthedExtension(accessToken, browserWidth, browserHeight, tempBrowserPreferencesDirectory, options) {
-    const { credentials, disableIsolation, ignoreCertificateErrors, runnerType, loggerFunc, } = options;
-    const pathToExtension = await (0, trainerUtil_1.getMablTrainerExtensionPath)();
-    const chromePath = 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');
-    }
-    messaging_1.mablEventEmitter.log(`Using Chrome at the following path: ${chromePath}`);
-    const launchArgs = [
-        `--disable-extensions-except=${pathToExtension}`,
-        `--load-extension=${pathToExtension}`,
-        `--window-size=${browserWidth},${browserHeight}`,
-    ];
-    if (ignoreCertificateErrors) {
-        launchArgs.push('--ignore-certificate-errors');
-    }
-    if (disableIsolation) {
-        launchArgs.push('--disable-features=IsolateOrigins,site-per-process');
-    }
-    const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, false, credentials, {
-        runnerType,
-        loggerFunc,
-    });
-    if (!maybeBrowser) {
-        throw new Error('Unable to start Chrome session');
-    }
-    await setUpAuthTokenForExtension(maybeBrowser, accessToken);
-    maybeBrowser.on(browserLauncher_1.BrowserEvent.BrowserDestroyed, () => removeTempBrowserPreferencesDirectory(tempBrowserPreferencesDirectory));
-    return maybeBrowser;
-}
-exports.createBrowserWithAuthedExtension = createBrowserWithAuthedExtension;
 async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, options) {
     var _a;
     const { bypassContentSecurityPolicy, defaultDeviceDescriptor, disableFocusEmulation, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
@@ -312,15 +280,6 @@ async function createBrowserForExecutionEngine(browserWidth, browserHeight, head
     return maybeBrowser;
 }
 exports.createBrowserForExecutionEngine = createBrowserForExecutionEngine;
-async function setUpAuthTokenForExtension(browser, accessToken) {
-    const backgroundPage = await browser.getExtensionBackgroundPage((0, trainerUtil_1.getTrainerId)());
-    await backgroundPage.evaluate((token) => {
-        localStorage.setItem('authResult', JSON.stringify({ idToken: token }));
-        localStorage.setItem('trainerWorld', 'mablCLI');
-    }, accessToken);
-    return;
-}
-exports.setUpAuthTokenForExtension = setUpAuthTokenForExtension;
 async function getExtensionBackgroundPageWithCliTool(browser) {
     const backgroundPage = await browser.getExtensionBackgroundPage((0, trainerUtil_1.getTrainerId)());
     if (backgroundPage) {
@@ -634,28 +593,31 @@ 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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const journeyRun = await apiClient.getTestRun(testRunId);
     const planRun = await apiClient.getPlanRun(journeyRun.parent_execution);
     return {
-        environmentId: (_b = (_a = journeyRun.journey_parameters) === null || _a === void 0 ? void 0 : _a.deployment) === null || _b === void 0 ? void 0 : _b.environment_id,
+        basicAuthCredentialsId: ((_a = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _a === void 0 ? void 0 : _a.http_auth_credentials_required)
+            ? (_b = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _b === void 0 ? void 0 : _b.http_auth_credentials_id
+            : undefined,
         branchName: (_c = journeyRun.journey_parameters) === null || _c === void 0 ? void 0 : _c.source_control_tag,
-        credentialsId: (_d = planRun.run_policy) === null || _d === void 0 ? void 0 : _d.credentials_id,
-        filterHttpRequests: false,
-        testId: (_e = journeyRun.journey) === null || _e === void 0 ? void 0 : _e.invariant_id,
-        url: (_g = (_f = journeyRun.journey_parameters) === null || _f === void 0 ? void 0 : _f.deployment) === null || _g === void 0 ? void 0 : _g.uri,
-        basicAuthCredentialsId: ((_h = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _h === void 0 ? void 0 : _h.http_auth_credentials_required)
-            ? (_j = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _j === void 0 ? void 0 : _j.http_auth_credentials_id
+        credentialsId: ((_d = planRun.run_policy) === null || _d === void 0 ? void 0 : _d.credentials_required)
+            ? (_e = planRun.run_policy) === null || _e === void 0 ? void 0 : _e.credentials_id
             : undefined,
-        dataTableVariables: (_k = journeyRun.journey_parameters) === null || _k === void 0 ? void 0 : _k.user_variables,
-        deviceEmulation: (_l = journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.device_emulation,
+        dataTableVariables: (_f = journeyRun.journey_parameters) === null || _f === void 0 ? void 0 : _f.user_variables,
+        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,
     };
 }
 exports.pullDownTestRunConfig = pullDownTestRunConfig;
 async function extractTestRunConfig(executionMessage, apiClient) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     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)
@@ -663,17 +625,20 @@ 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 {
-        environmentId: (_e = (_d = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _d === void 0 ? void 0 : _d.deployment) === null || _e === void 0 ? void 0 : _e.environment_id,
-        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_id,
+        branchName: (_d = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _d === void 0 ? void 0 : _d.source_control_tag,
+        credentialsId: ((_e = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _e === void 0 ? void 0 : _e.credentials_required)
+            ? (_f = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _f === void 0 ? void 0 : _f.credentials_id
+            : undefined,
+        dataTableVariables: (_g = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _g === void 0 ? void 0 : _g.user_variables,
+        deviceEmulation: (_h = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _h === void 0 ? void 0 : _h.device_emulation,
+        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,
-        testId: (_h = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _h === void 0 ? void 0 : _h.invariant_id,
-        url: (_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.uri,
-        dataTableVariables: (_l = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.user_variables,
-        deviceEmulation: (_m = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.device_emulation,
-        importedVariables: (_o = journeyRun.journey_parameters) === null || _o === void 0 ? void 0 : _o.imported_variables,
+        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,
         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,
     };
 }
 exports.extractTestRunConfig = extractTestRunConfig;

package/commands/tests/tests_cmds/run.js

@@ -186,27 +186,27 @@ async function run(parsed) {
     });
     const testRunnerConfig = {
         _cliCreated: true,
-        branchName: parsed['mabl-branch'],
         basicAuthCredentialsId: parsed[constants_1.CommandArgBasicAuthCredentials],
+        branchName: parsed['mabl-branch'],
         credentialsId: parsed['credentials-id'],
         disableIsolation: parsed[constants_1.CommandArgBrowserDisableIsolation],
+        enableExtensions: parsed[constants_1.CommandArgBrowserEnableExtensions],
         enableLink: parsed[constants_1.CommandArgEnableLink],
         environmentId: parsed[constants_1.CommandArgEnvironmentId],
+        extraHttpHeaders,
         filterHttpRequests: false,
+        fromPlanId: parsed['from-plan-id'],
         headless: parsed.headless,
         height: parsed.height,
         highlights: parsed.highlights,
         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,
-        fromPlanId: parsed['from-plan-id'],
-        testId: parsed.id,
-        testFile: parsed[constants_1.CommandArgTestFile],
         runId: parsed['run-id'],
+        testFile: parsed[constants_1.CommandArgTestFile],
+        testId: parsed.id,
         url: parsed.url,
         userAgent: parsed[constants_1.CommandArgUserAgent],
         width: parsed.width,

package/commands/tests/tests_cmds/trainerUtil.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTrainerId = exports.LOCAL_TRAINER_ID = void 0;
+const env_1 = require("../../../env/env");
+exports.LOCAL_TRAINER_ID = 'jmeffipchlcmnkllcolcbmneknjckcpp';
+function getTrainerId() {
+    if (env_1.LOCAL_TRAINER_PATH) {
+        return env_1.EXTENSION_ID;
+    }
+    return exports.LOCAL_TRAINER_ID;
+}
+exports.getTrainerId = getTrainerId;