@mablhq/mabl-cli 1.31.3 → 1.31.11

package/Globals.js

@@ -1,6 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Globals = void 0;
+const os = __importStar(require("os"));
 class Globals {
     static getFindOverallTimeoutMs() {
         return Globals.findOverallTimeoutMs;
@@ -14,7 +38,28 @@ class Globals {
     static setPlaywrightInteractionWarningMs(timeout) {
         Globals.playwrightInteractionWarningMs = timeout;
     }
+    static getUploadDirectory() {
+        return Globals.uploadDirectory;
+    }
+    static setUploadDirectory(dir) {
+        Globals.uploadDirectory = dir;
+    }
+    static getUploadDirectoryPrefix() {
+        return Globals.uploadDirectoryPrefix;
+    }
+    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.uploadDirectory = os.tmpdir();
+Globals.uploadDirectoryPrefix = `mablTestRunUploads-`;
+Globals.testMaxAgeMs = 1000 * 60 * 60 * 24;

package/api/basicApiClient.js

@@ -65,6 +65,8 @@ class BasicApiClient {
         }
         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;
+        config.maxBodyLength = Infinity;
+        config.maxContentLength = Infinity;
         switch (options.authType) {
             case types_1.AuthType.ApiKey:
                 config.auth = {

package/api/mablApiClient.js

@@ -453,7 +453,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
             throw toApiError(`Failed to get Branches`, error);
         }
     }
-    async getUploadFileUrl(fileId) {
+    async getFileUploadUrl(fileId) {
         try {
             return await this.makeGetRequest(`${this.baseApiUrl}/files/fileUpload/url/${fileId}`);
         }
@@ -609,6 +609,14 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
         requestBody.actions = actions;
         return requestBody;
     }
+    async getTestRunsForPlan(planRunId) {
+        try {
+            return this.makeGetRequest(`${this.baseApiUrl}/journeyRuns/planRun/${planRunId}`);
+        }
+        catch (error) {
+            throw toApiError(`Failed to retrieve tests for plan`, error);
+        }
+    }
     async postPlanRun(organizationId, testId, branchName, browserTypes, appUrl, apiUrl, deploymentId, credentialsId, deploymentIds, basicAuthCredentialsId) {
         try {
             const requestBody = this.buildAdHocPlanRunRequestBody(organizationId, testId, browserTypes, branchName, appUrl, apiUrl, deploymentId, credentialsId, deploymentIds, basicAuthCredentialsId);

package/commands/tests/testsUtil.js

@@ -26,14 +26,12 @@ 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.createBrowserForExecutionEngine = exports.addExecutionEngineLaunchArgs = exports.createBrowser = exports.prepareChromePreferencesDirectory = 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.cleanupTestResources = 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 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 stream_1 = require("stream");
 const browserLauncher_1 = require("../../browserLauncher/browserLauncher");
 const trainingSessionActions_1 = require("../../core/messaging/actions/trainingSessionActions");
 const logLineMessaging_1 = require("../../core/messaging/logLineMessaging");
@@ -41,12 +39,13 @@ const messaging_1 = require("../../core/messaging/messaging");
 const env_1 = require("../../env/env");
 const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
-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 trainerUtil_1 = require("./tests_cmds/trainerUtil");
+const logUtils_1 = require("../../util/logUtils");
+const fileUploadUtil_1 = require("../../util/fileUploadUtil");
 const chalk = require('chalk');
 const chromeFinder = require('chrome-launcher/dist/chrome-finder');
 const launchUtils = require('chrome-launcher/dist/utils');
@@ -497,46 +496,19 @@ function handleExtensionMessage(message, trainingBrowser) {
             break;
     }
 }
-async function downloadUploadFile(fileUploadUrl, fileUpload, downloadDirectory, mablApiClient) {
-    let client;
-    if (mablApiClient) {
-        client = mablApiClient.httpClient;
-    }
-    else {
-        client = axios_1.default.create(await (0, httpUtil_1.currentProxyConfig)());
-    }
+function cleanupTestResources(testContext) {
     try {
-        const finalDirectory = path.normalize(`${downloadDirectory}/${fileUpload.id}`);
-        try {
-            fs.mkdirSync(finalDirectory);
-        }
-        catch (error) {
-            if (!error.message.includes('file already exists')) {
-                throw error;
-            }
-        }
-        const finalPath = path.normalize(`${finalDirectory}/${fileUpload.name}`);
-        const writer = fs.createWriteStream(finalPath);
-        const response = await client.get(fileUploadUrl, {
-            responseType: 'stream',
-        });
-        if (response.data.pipe) {
-            response.data.pipe(writer);
+        if (testContext) {
+            testContext.getFileUploadDirs().forEach((dir) => (0, fileUploadUtil_1.removeUploadDirs)(dir));
+            testContext.clearFileUploadDirs();
         }
-        else if (!(response.status >= 400)) {
-            stream_1.Readable.from(response.data).pipe(writer);
-        }
-        return new Promise((resolve, reject) => {
-            writer.on('finish', () => resolve(finalPath));
-            writer.on('error', reject);
-        });
     }
-    catch (error) {
-        loggingProvider_1.logger.error(chalk.red.bold('Error encountered downloading file for File Upload Step replay'));
-        throw error;
+    catch (e) {
+        const msg = `WARNING: error received when cleaning up after tests: ${e.message}`;
+        (0, logUtils_1.logCliOutput)(loggingProvider_1.LogLevel.Warn, msg);
     }
 }
-exports.downloadUploadFile = downloadUploadFile;
+exports.cleanupTestResources = cleanupTestResources;
 function validateRunEditCommand(idArg, testRunIdArg) {
     if (!idArg && !testRunIdArg) {
         throw new Error(chalk.red(`Please specify a test ID (--${constants_1.CommandArgId}) or test run ID (--${constants_1.CommandArgTestRunId})\n`));

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

@@ -180,22 +180,27 @@ async function runInCloud(parsed) {
     loggingProvider_1.logger.info(chalk.white('---'));
     const resultUrls = [];
     for (const test of tests) {
-        const urls = await executeRunCloudTest(test, browsers, branchName, apiClient, maybeDeploymentId, maybeUrlApp, maybeUrlApi, credentialsId, applicationId, environmentId, basicAuthCredentialsId);
-        resultUrls.push(...urls);
+        const testRuns = await executeRunCloudTest(test, browsers, branchName, apiClient, maybeDeploymentId, maybeUrlApp, maybeUrlApi, credentialsId, applicationId, environmentId, basicAuthCredentialsId);
+        testRuns.forEach((testRun) => resultUrls.push(`${env_1.BASE_APP_URL}/workspaces/${testRun.organization_id}/test/journey-runs/${testRun.id}`));
         loggingProvider_1.logger.info(chalk.white('---'));
     }
     let outputUrl;
-    if (resultUrls.length > 1) {
-        outputUrl = `${env_1.BASE_APP_URL}/workspaces/${workspaceId}/output`;
-        loggingProvider_1.logger.info(`See mabl results page to view tests [${chalk.magenta(outputUrl)}]`);
-    }
-    else {
+    if (resultUrls.length === 1) {
         outputUrl = resultUrls[0];
         loggingProvider_1.logger.info(`See mabl test output page for results [${chalk.magenta(outputUrl)}]`);
     }
+    else {
+        let filter = '';
+        if (labelsInclude.length === 1) {
+            filter = `?labels=${labelsInclude[0]}`;
+        }
+        outputUrl = `${env_1.BASE_APP_URL}/workspaces/${workspaceId}/output${filter}`;
+        loggingProvider_1.logger.info(`See mabl results page to view tests [${chalk.magenta(outputUrl)}]`);
+    }
     return outputUrl;
 }
 async function executeRunCloudTest(test, browsers, branchName, apiClient, maybeDeploymentId, appUrl, apiUrl, credentialsId, applicationId, environmentId, basicAuthCredentialsId) {
+    var _a;
     const effectiveAppUrl = appUrl !== null && appUrl !== void 0 ? appUrl : test === null || test === void 0 ? void 0 : test.url;
     const workspaceId = test.organization_id;
     const testId = test.invariant_id;
@@ -222,9 +227,8 @@ async function executeRunCloudTest(test, browsers, branchName, apiClient, maybeD
         deploymentIds = foundDeployments.map((deployment) => deployment.id);
     }
     const planRun = await apiClient.postPlanRun(workspaceId, testId, branchName, browsers, effectiveAppUrl, apiUrl, maybeDeploymentId, credentialsId, deploymentIds, basicAuthCredentialsId);
-    return planRun.scripts
-        ? planRun.scripts.map((script) => `${env_1.BASE_APP_URL}/workspaces/${planRun.organization_id}/test/journey-runs/${script.id}`)
-        : [];
+    const testRunsQueryResult = await apiClient.getTestRunsForPlan(planRun.id);
+    return (_a = testRunsQueryResult.test_script_executions) !== null && _a !== void 0 ? _a : [];
 }
 async function getJourneysForLabels(workspaceId, branchName, branchChangesOnly, labelsInclude, labelsExclude, limit, prompt, apiClient) {
     var _a;

package/commands/tests/tests_cmds/run.js

@@ -8,6 +8,7 @@ const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const mablApi_1 = require("../../../mablApi");
 const reporter_1 = require("../../../reporters/reporter");
 const browserTypes_1 = require("../../browserTypes");
+const execution_1 = require("../../../execution");
 const chalk = require('chalk');
 const execution = require('../../../execution/index');
 exports.command = `run`;
@@ -236,8 +237,16 @@ async function run(parsed) {
         workspaceId,
     };
     loggingProvider_1.logger.info('Warming up test runner...');
-    const mablTestRunner = await execution.createMablTestRunner(testRunnerConfig);
-    const results = await mablTestRunner.run();
+    const mablTestsRunner = await execution.createMablTestRunner(testRunnerConfig);
+    const results = await mablTestsRunner.run();
+    if ((mablTestsRunner === null || mablTestsRunner === void 0 ? void 0 : mablTestsRunner.mablTestRunners) !== undefined) {
+        mablTestsRunner.mablTestRunners
+            .filter((tr) => tr instanceof execution_1.MablTestRunner)
+            .forEach((tr) => {
+            const testContext = tr.testContext;
+            (0, testsUtil_1.cleanupTestResources)(testContext);
+        });
+    }
     loggingProvider_1.logger.logNewLine();
     loggingProvider_1.logger.info(`Test count: ${results.numTotalTests}`);
     loggingProvider_1.logger.info(`Passed: ${results.numPassedTests}`);