@mablhq/mabl-cli 2.79.1 → 2.79.7

package/commands/tests/testsUtil.js

@@ -408,44 +408,42 @@ function validateRunCommandWithLabels(testId, suppliedLabelsInclude, suppliedLab
     }
     return true;
 }
-async function pullDownTestRunConfig(testRunId, apiClient) {
-    const journeyRun = await apiClient.getTestRun(testRunId);
-    const planRun = await apiClient.getPlanRun(journeyRun.parent_execution);
-    const testDatatablevariables = journeyRun?.journey_parameters?.user_variables &&
-        (0, utils_1.variableRowAsScenario)(journeyRun?.journey_parameters?.user_variables);
-    const dataTableId = testDatatablevariables?.table_id;
-    if (dataTableId) {
-        await apiClient.getDataTable(dataTableId);
-    }
+function buildTestRunConfig(testRun, filterHttpRequests, planRun) {
+    const testDatatablevariables = testRun.journey_parameters?.user_variables &&
+        (0, utils_1.variableRowAsScenario)(testRun.journey_parameters?.user_variables);
     return {
-        basicAuthCredentialsId: planRun?.run_policy?.http_auth_credentials_required
-            ? planRun?.run_policy?.http_auth_credentials_id
-            : undefined,
-        branchName: journeyRun.journey_parameters?.source_control_tag,
-        credentialsId: planRun.run_policy?.credentials_required
-            ? planRun.run_policy?.credentials_id
-            : undefined,
+        basicAuthCredentialsId: testRun.journey_parameters?.http_auth_credentials_id ??
+            (planRun?.run_policy?.http_auth_credentials_required
+                ? planRun?.run_policy?.http_auth_credentials_id
+                : undefined),
+        branchName: testRun.journey_parameters?.source_control_tag,
+        credentialsId: testRun.journey_parameters?.credentials_id ??
+            (planRun?.run_policy?.credentials_required
+                ? planRun?.run_policy?.credentials_id
+                : undefined),
         dataTableVariables: testDatatablevariables,
-        deviceEmulation: journeyRun.journey_parameters?.device_emulation,
-        environmentId: journeyRun.journey_parameters?.deployment?.environment_id,
+        deviceEmulation: testRun.journey_parameters?.device_emulation,
+        environmentId: testRun.journey_parameters?.deployment?.environment_id,
         extraHttpHeaders: planRun?.run_policy?.http_headers_required === true
-            ? planRun?.run_policy?.http_headers?.reduce((headers, header) => ({
-                ...headers,
-                [header.name]: header.value ?? '',
-            }), {})
+            ? headerArrayToRecord(planRun?.run_policy?.http_headers)
             : undefined,
-        filterHttpRequests: false,
-        importedVariables: journeyRun.journey_parameters?.imported_variables,
-        linkCrawlerStartingUrlOverride: getLinkCrawlerUrlOverride(journeyRun),
-        localizationOptions: journeyRun.localization_options,
-        pageLoadWait: journeyRun.journey_parameters?.page_load_wait,
-        runId: journeyRun.id,
-        testId: journeyRun.journey?.invariant_id,
-        url: journeyRun.journey_parameters?.deployment?.uri,
+        filterHttpRequests,
+        importedVariables: testRun.journey_parameters?.imported_variables,
+        linkCrawlerStartingUrlOverride: getLinkCrawlerUrlOverride(testRun),
+        localizationOptions: testRun.localization_options,
+        pageLoadWait: testRun.journey_parameters?.page_load_wait,
+        runId: testRun.id,
+        testId: testRun.journey?.invariant_id,
+        url: testRun.journey_parameters?.deployment?.uri,
     };
 }
+async function pullDownTestRunConfig(testRunId, apiClient) {
+    const testRun = await apiClient.getTestRun(testRunId);
+    const planRun = await apiClient.getPlanRun(testRun.parent_execution);
+    return buildTestRunConfig(testRun, false, planRun);
+}
 async function extractTestRunConfig(executionMessage, apiClient) {
-    const journeyRun = executionMessage.journey_run ??
+    const testRun = executionMessage.journey_run ??
         (await apiClient.getTestRun(executionMessage.journey_run_id));
     const planRun = executionMessage.plan_run;
     const maybeRunnerType = planRun?.run_policy
@@ -453,31 +451,8 @@ async function extractTestRunConfig(executionMessage, apiClient) {
         ?
             planRun?.run_policy?.nodejs_runtime_variant
         : undefined;
-    const config = {
-        basicAuthCredentialsId: planRun?.run_policy?.http_auth_credentials_required
-            ? planRun?.run_policy?.http_auth_credentials_id
-            : undefined,
-        branchName: journeyRun?.journey_parameters?.source_control_tag,
-        credentialsId: planRun?.run_policy?.credentials_required
-            ? planRun?.run_policy?.credentials_id
-            : undefined,
-        dataTableVariables: journeyRun?.journey_parameters?.user_variables &&
-            (0, utils_1.variableRowAsScenario)(journeyRun?.journey_parameters?.user_variables),
-        deviceEmulation: journeyRun?.journey_parameters?.device_emulation,
-        environmentId: journeyRun?.journey_parameters?.deployment?.environment_id,
-        extraHttpHeaders: planRun?.run_policy?.http_headers_required === true
-            ? headerArrayToRecord(planRun?.run_policy?.http_headers)
-            : undefined,
-        filterHttpRequests: true,
-        importedVariables: journeyRun.journey_parameters?.imported_variables,
-        linkCrawlerStartingUrlOverride: getLinkCrawlerUrlOverride(journeyRun),
-        localizationOptions: journeyRun.localization_options,
-        pageLoadWait: journeyRun.journey_parameters?.page_load_wait,
-        runId: journeyRun.id,
-        runnerType: maybeRunnerType,
-        testId: journeyRun?.journey?.invariant_id,
-        url: journeyRun?.journey_parameters?.deployment?.uri,
-    };
+    const config = buildTestRunConfig(testRun, true, planRun);
+    config.runnerType = maybeRunnerType;
     if (executionMessage.test_type === mablApi_1.TestTypeEnum.Mobile) {
         const mobileMessage = executionMessage;
         config.mobileConfig = {