@mablhq/mabl-cli 2.52.6 → 2.53.3

package/commands/config/config_cmds/configKeys.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidProxyType = exports.isValidProxyMode = exports.proxyTypes = exports.proxyModes = exports.validConfigKeyChoices = exports.configKeys = void 0;
+exports.isValidProxyMode = exports.proxyModes = exports.validConfigKeyChoices = exports.configKeys = void 0;
 exports.configKeys = Object.freeze({
     browserPath: 'browser.path',
     enableSourceControlMetadataCollection: 'alpha.scm_metadata.enable',
@@ -17,12 +17,7 @@ exports.proxyModes = [
     'all',
     'none',
 ];
-exports.proxyTypes = ['legacy', 'current'];
 function isValidProxyMode(value) {
     return exports.proxyModes.indexOf(value) !== -1;
 }
 exports.isValidProxyMode = isValidProxyMode;
-function isValidProxyType(value) {
-    return exports.proxyTypes.indexOf(value) !== -1;
-}
-exports.isValidProxyType = isValidProxyType;

package/commands/config/config_cmds/set.js

@@ -6,6 +6,7 @@ const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
 const list_1 = require("./list");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const configKeys_1 = require("./configKeys");
+const types_1 = require("../../../api/types");
 exports.configKeyCommandArg = 'config-key';
 const configValue = 'config-value';
 exports.command = `set <${exports.configKeyCommandArg}> <${configValue}>`;
@@ -56,8 +57,8 @@ async function setConfig(parsed) {
             await cliConfigProvider_1.CliConfigProvider.setConfigProperty(key, value);
             break;
         case configKeys_1.configKeys.proxyType:
-            if (!(0, configKeys_1.isValidProxyType)(value)) {
-                throw new Error(`Invalid proxy type. The value must be one of ${JSON.stringify(configKeys_1.proxyTypes)}`);
+            if (!(0, types_1.isValidProxyType)(value)) {
+                throw new Error(`Invalid proxy type. The value must be one of ${JSON.stringify(types_1.proxyTypes)}`);
             }
             await cliConfigProvider_1.CliConfigProvider.setConfigProperty(key, value);
             break;

package/commands/tests/tests_cmds/import_cmds/import_playwright.js

@@ -48,7 +48,7 @@ import { test } from "@playwright/test";
 test("mablImportInfo", async ({baseURL, trace}) => {
   console.log('@mabl project info',
     JSON.stringify({
-      baseURL: baseURL,
+      baseUrl: baseURL,
     })
   );
 });
@@ -56,7 +56,7 @@ test("mablImportInfo", async ({baseURL, trace}) => {
 var PostImportActions;
 (function (PostImportActions) {
     PostImportActions["Discard"] = "Discard the test";
-    PostImportActions["Run"] = "Run the test locally";
+    PostImportActions["Run"] = "Run test to activate auto-heal";
     PostImportActions["Save"] = "Save the test";
     PostImportActions["View"] = "View the test description";
 })(PostImportActions || (PostImportActions = {}));
@@ -127,7 +127,7 @@ exports.handler = (0, util_1.failWrapper)(processCommand);
 async function processCommand(parsed) {
     const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
-    const importedTests = await importTests(parsed);
+    const { importedTests, playwrightProject } = await importTests(parsed);
     if (!importedTests.length) {
         return Promise.reject(new Error(`No tests were imported.`));
     }
@@ -137,7 +137,7 @@ async function processCommand(parsed) {
     else {
         loggingProvider_1.logger.info(`Imported ${(0, pluralize_1.default)('step', importedTests[0].steps.length, true)}.\n`);
     }
-    return handlePostImportActions(workspaceId, apiClient, importedTests, parsed[constants_1.CommandArgAuto]);
+    return handlePostImportActions(workspaceId, apiClient, importedTests, playwrightProject, parsed[constants_1.CommandArgAuto]);
 }
 async function importTests(args) {
     var _a, _b;
@@ -158,23 +158,23 @@ async function importTests(args) {
         importedTests = processTracesPath(tracesPath, playwrightProject, converter);
     }
     converter.printMissingApis(loggingProvider_1.logger);
-    return importedTests;
+    return { importedTests, playwrightProject };
 }
-async function handlePostImportActions(workspaceId, apiClient, importedTests, autoSave) {
+async function handlePostImportActions(workspaceId, apiClient, importedTests, playwrightProject, autoSave) {
     let nextAction;
     do {
         nextAction = await getNextAction(autoSave);
         loggingProvider_1.logger.logNewLine();
         switch (nextAction) {
             case PostImportActions.Save:
-                return saveTests(workspaceId, apiClient, importedTests).then(() => {
+                return saveTests(workspaceId, apiClient, importedTests, playwrightProject).then(() => {
                     loggingProvider_1.logger.info('Import complete.');
                 });
             case PostImportActions.View:
                 displayTestDescriptions(importedTests);
                 break;
             case PostImportActions.Run:
-                await runTests(workspaceId, apiClient, importedTests);
+                await runTests(workspaceId, apiClient, importedTests, playwrightProject);
                 break;
             case PostImportActions.Discard:
                 loggingProvider_1.logger.info('Exiting without saving.');
@@ -198,10 +198,10 @@ async function getNextAction(autoSave) {
     ]);
     return answer.action;
 }
-function saveTests(workspaceId, apiClient, importedTests) {
+function saveTests(workspaceId, apiClient, importedTests, playwrightProject) {
     loggingProvider_1.logger.info(`Saving ${(0, pluralize_1.default)('test', importedTests.length, true)}...`);
     const savePromises = importedTests.map((test) => apiClient
-        .createFlow(stepsToFlow(workspaceId, test.steps))
+        .createFlow(stepsToFlow(workspaceId, test, playwrightProject))
         .then((flow) => apiClient.createJourney(flowToJourney(test.testName, flow)))
         .then((journey) => {
         loggingProvider_1.logger.info(`Saved test ${journey.invariant_id} : ${env_1.BASE_APP_URL}/workspaces/${journey.organization_id}/train/tests/${journey.invariant_id}/current`);
@@ -218,13 +218,13 @@ function displayTestDescriptions(importedTests) {
         loggingProvider_1.logger.logNewLine();
     });
 }
-async function runTests(workspaceId, apiClient, importedTests) {
-    var _a, _b, _c;
+async function runTests(workspaceId, apiClient, importedTests, playwrightProject) {
+    var _a, _b, _c, _d;
     const tests = importedTests.map((test) => ({
         test,
-        flow: stepsToFlow(workspaceId, test.steps),
+        flow: stepsToFlow(workspaceId, test, playwrightProject),
     }));
-    const firstUrl = (_b = (_a = tests.find((test) => test.flow.url)) === null || _a === void 0 ? void 0 : _a.flow) === null || _b === void 0 ? void 0 : _b.url;
+    const firstUrl = (_a = playwrightProject.baseUrl) !== null && _a !== void 0 ? _a : (_c = (_b = tests.find((test) => test.flow.url)) === null || _b === void 0 ? void 0 : _b.flow) === null || _c === void 0 ? void 0 : _c.url;
     const browserPath = await new chromiumBrowserEngine_1.ChromiumBrowserEngine().findBrowserExecutable();
     for (let testIndex = 0; testIndex < tests.length; testIndex++) {
         const testToRun = tests[testIndex];
@@ -233,14 +233,25 @@ async function runTests(workspaceId, apiClient, importedTests) {
             organization_id: workspaceId,
             name: testToRun.test.testName,
             flows: [],
-            url: (_c = testToRun.flow.url) !== null && _c !== void 0 ? _c : firstUrl,
+            url: (_d = testToRun.flow.url) !== null && _d !== void 0 ? _d : firstUrl,
         };
         const testRunner = await createTestRunner(apiClient, journey, testToRun.flow, journey.url, workspaceId, browserPath);
         const results = await testRunner.run();
         loggingProvider_1.logger.info(`Test result: ${results.status}`);
+        updateMablscript(testRunner, testToRun.test);
     }
 }
-function stepsToFlow(workspaceId, steps) {
+function updateMablscript(testRunner, test) {
+    var _a;
+    let mablscript = '';
+    for (const step of (_a = testRunner.steps) !== null && _a !== void 0 ? _a : []) {
+        mablscript += step.toMablscript() + '\n';
+    }
+    test.updatedMablscript = mablscript;
+}
+function stepsToFlow(workspaceId, test, playwrightProject) {
+    var _a, _b;
+    const steps = test.steps;
     const prototype = {
         import_source_id: mablApi_1.ImportSourceId.SeleniumNodeProxy,
         import_source_version: (0, pureUtil_1.getCliVersion)(),
@@ -252,9 +263,9 @@ function stepsToFlow(workspaceId, steps) {
             .map((selector) => selector === null || selector === void 0 ? void 0 : selector.toMablscriptSelector())
             .filter((selector) => selector)
             .map((selector) => selector),
-        script: steps.map((step) => step.mablscript).join('\n'),
+        script: (_a = test.updatedMablscript) !== null && _a !== void 0 ? _a : steps.map((step) => step.mablscript).join('\n'),
         script_description: steps.map((step) => step.description).join('\n'),
-        url: steps.map((step) => step.url).find((url) => url),
+        url: (_b = playwrightProject.baseUrl) !== null && _b !== void 0 ? _b : steps.map((step) => step.url).find((url) => url),
     };
     return prototype;
 }
@@ -278,7 +289,10 @@ async function createTestRunner(apiClient, test, flow, url, workspaceId, browser
         },
         mablApiClient: apiClient,
     });
-    await runner.initializeTestRunner(test, [flow], 'master', apiClient, false, browserPath, { url });
+    await runner.initializeTestRunner(test, [flow], 'master', apiClient, false, browserPath, {
+        enableCustomFindConversions: true,
+        url,
+    });
     return runner;
 }
 function processSingleTraceFile(traceFile, playwrightProject, converter) {
@@ -372,11 +386,13 @@ async function getProjectInfo(args) {
     const processClosedPromise = new RichPromise_1.default();
     const playwrightProcess = spawn('npx', commandArgs, options);
     playwrightProcess.stdout.on('data', (data) => {
+        const lineHint = '@mabl project info';
         consoleLines.push(data.toString());
-        if (data.toString().includes('@mabl project info') &&
+        if (data.toString().includes(lineHint) &&
             processClosedPromise.isPending()) {
             try {
-                const info = JSON.parse(data.toString().split('@mabl project info')[1]);
+                const line = data.toString().split(lineHint)[1].split('\n')[0].trim();
+                const info = JSON.parse(line);
                 processClosedPromise.resolve(info);
             }
             catch {

package/commands/tests/tests_cmds/run.js

@@ -243,6 +243,7 @@ async function run(parsed) {
         _cliCreated: true,
         basicAuthCredentialsId: parsed[constants_1.CommandArgBasicAuthCredentials],
         branchName: parsed['mabl-branch'],
+        branchChangesOnly: parsed['branch-changes-only'],
         browserType,
         credentialsId: parsed['credentials-id'],
         dataTableVariables: scenario,

package/core/execution/ApiTestUtils.js

@@ -33,7 +33,7 @@ const RESPONSE_PROPERTIES = {
 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: 'Size (bytes)', value: newman_types_1.AssertionTarget.Size },
     { label: 'JSON Body', value: newman_types_1.AssertionTarget.JSONBody },
     { label: 'Text Body', value: newman_types_1.AssertionTarget.TextBody },
 ];