froth-webdriverio-framework 6.0.71 → 6.0.73

package/froth_api_calls/getexecutionDetails.js

@@ -3,243 +3,248 @@
    ========================================================= */
 
 const DEFAULT_HEADERS = (token) => ({
-  'Authorization': `Bearer ${token}`,
-  'Content-Type': 'application/json'
+    'Authorization': `Bearer ${token}`,
+    'Content-Type': 'application/json'
 });
 
 /* ===================== HELPERS ===================== */
 
 function isValidId(id) {
-  return id !== null && id !== undefined && id !== 0;
+    return id !== null && id !== undefined && id !== 0;
 }
 
 async function handleResponse(response, context) {
-  if (response.ok) {
-    return response.json();
-  }
+    if (response.ok) {
+        return response.json();
+    }
 
-  if (response.status === 401) {
-    console.error(`🔒 Unauthorized (401) in ${context}`);
-    return null;
-  }
+    if (response.status === 401) {
+        console.error(`🔒 Unauthorized (401) in ${context}`);
+        return null;
+    }
 
-  const errorText = await response.text();
-  console.error(`❌ ${context} failed [${response.status}]: ${errorText}`);
-  return null;
+    const errorText = await response.text();
+    console.error(`❌ ${context} failed [${response.status}]: ${errorText}`);
+    return null;
 }
 
 /* ===================== GET EXECUTION ===================== */
 
 async function getExecuitonDetails(frothUrl, token, id) {
-  if (!isValidId(id)) {
-    console.error('❌ Invalid execution ID');
-    return null;
-  }
+    if (!isValidId(id)) {
+        console.error('❌ Invalid execution ID');
+        return null;
+    }
 
-  const url = `${frothUrl}/api/test-execution-retrieve/${id}/`;
-  console.log('GET:', url);
+    const url = `${frothUrl}/api/test-execution-retrieve/${id}/`;
+    console.log('GET:', url);
 
-  try {
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: DEFAULT_HEADERS(token)
-    });
+    try {
+        const response = await fetch(url, {
+            method: 'GET',
+            headers: DEFAULT_HEADERS(token)
+        });
 
-    const data = await handleResponse(response, 'getExecuitonDetails');
-    if (!data) return null;
+        const data = await handleResponse(response, 'getExecuitonDetails');
+        if (!data) return null;
 
-    const jsondata = {
-      automation_suite_id: data?.automation_suite_details?.id ?? null,
-      test_cycle_id: data?.test_cycle_details?.id ?? null,
-      app_url: data?.app_details?.app_url ?? null,
-      browser_stack_local: data?.capability_details?.browser_stack_local ?? null,
-      mediaurls: data?.media_details?.map(m => m.media_url) ?? []
-    };
+        const jsondata = {
+            automation_suite_id: data?.automation_suite_details?.id ?? null,
+            test_cycle_id: data?.test_cycle_details?.id ?? null,
+            app_url: data?.app_details?.app_url ?? null,
+            browser_stack_local: data?.capability_details?.browser_stack_local ?? null,
+            mediaurls: data?.media_details?.map(m => m.media_url) ?? []
+        };
 
-    console.log('✅ Execution details loaded');
-    return jsondata;
+        console.log('✅ Execution details loaded');
+        return jsondata;
 
-  } catch (error) {
-    console.error('❌ getExecuitonDetails error:', error.message);
-    return null;
-  }
+    } catch (error) {
+        console.error('❌ getExecuitonDetails error:', error.message);
+        return null;
+    }
 }
 
 /* ===================== SCRIPT MAPPING ===================== */
 
 async function getExecuitonScriptDetails(
-  frothUrl,
-  token,
-  execution_id,
-  script_id,
-  script_platform
+    frothUrl,
+    token,
+    execution_id,
+    script_id,
+    script_platform
 ) {
-  if (!isValidId(script_id)) {
-    console.error('❌ Invalid script ID');
-    return null;
-  }
+    if (!isValidId(script_id)) {
+        console.error('❌ Invalid script ID');
+        return null;
+    }
 
-  const url =
-    `${frothUrl}/api/execution-script-mapping/` +
-    `?execution_id=${execution_id}` +
-    `&automation_script_id=${script_id}` +
-    `&platform=${script_platform}`;
+    const url =
+        `${frothUrl}/api/execution-script-mapping/` +
+        `?execution_id=${execution_id}` +
+        `&automation_script_id=${script_id}` +
+        `&platform=${script_platform}`;
 
-  console.log('GET:', url);
+    console.log('GET:', url);
 
-  try {
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: DEFAULT_HEADERS(token)
-    });
+    try {
+        const response = await fetch(url, {
+            method: 'GET',
+            headers: DEFAULT_HEADERS(token)
+        });
 
-    const data = await handleResponse(response, 'getExecuitonScriptDetails');
-    if (!data || !data.length) return null;
+        const data = await handleResponse(response, 'getExecuitonScriptDetails');
+        if (!data || !data.length) return null;
 
-    return data[0].id;
+        return data[0].id;
 
-  } catch (error) {
-    console.error('❌ getExecuitonScriptDetails error:', error.message);
-    return null;
-  }
+    } catch (error) {
+        console.error('❌ getExecuitonScriptDetails error:', error.message);
+        return null;
+    }
 }
 
 /* ===================== UPDATE EXECUTION ===================== */
 
 async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
-  if (!isValidId(id)) {
-    console.error('❌ Invalid execution ID for update');
-    return;
-  }
-
-  if (BUFFER.getItem('FROTH_UPDATE_EXECUTION') === 'TRUE') {
-    console.log('ℹ️ Execution already updated — skipping');
-    return;
-  }
-
-  const url = `${frothUrl}/api/test-execution-update/${id}/`;
-  const formData = new FormData();
-
-  console.log('PUT:', url);
-
-  try {
-    formData.append('updated_through_bot', true);
-
-    if (resultdetails.excution_status) {
-      formData.append('excution_status', resultdetails.excution_status);
+    if (!isValidId(id)) {
+        console.error('❌ Invalid execution ID for update');
+        return;
     }
 
-    if (
-      resultdetails.excution_time &&
-      resultdetails.excution_time !== 'NaN:NaN:NaN'
-    ) {
-      formData.append('excution_time', resultdetails.excution_time);
+    if (BUFFER.getItem('FROTH_UPDATE_EXECUTION') === 'TRUE') {
+        console.log('ℹ️ Execution already updated — skipping');
+        return;
     }
 
-    if (Array.isArray(resultdetails.comments) && resultdetails.comments.length) {
-      formData.append('comments', resultdetails.comments.join('<br>'));
-    }
-
-    const response = await fetch(url, {
-      method: 'PUT',
-      headers: { 'Authorization': `Bearer ${token}` },
-      body: formData
-    });
-
-    const data = await handleResponse(response, 'updateExecuitonDetails');
-    if (!data) return;
+    const url = `${frothUrl}/api/test-execution-update/${id}/`;
+    const formData = new FormData();
 
-    BUFFER.setItem('FROTH_UPDATE_EXECUTION', 'TRUE');
-    console.log('✅ Execution details updated');
+    console.log('PUT:', url);
 
-  } catch (error) {
-    console.error('❌ updateExecuitonDetails error:', error.message);
-  }
+    try {
+        formData.append('updated_through_bot', true);
+
+        if (resultdetails.excution_status) {
+            formData.append('excution_status', resultdetails.excution_status);
+        }
+
+        if (
+            resultdetails.excution_time &&
+            resultdetails.excution_time !== 'NaN:NaN:NaN'
+        ) {
+            formData.append('excution_time', resultdetails.excution_time);
+        }
+
+        if (Array.isArray(resultdetails.comments) && resultdetails.comments.length) {
+            formData.append('comments', resultdetails.comments.join('<br>'));
+        }
+        // ✅ Log actual FormData keys
+        console.log('📤 FormData keys sent:');
+        for (const [key, value] of formData.entries()) {
+            console.log(`   ${key}: ${value}`);
+        }
+        const response = await fetch(url, {
+            method: 'PUT',
+            headers: { 'Authorization': `Bearer ${token}` },
+            body: formData
+        });
+
+
+        const data = await handleResponse(response, 'updateExecuitonDetails');
+        if (!data) return;
+
+        BUFFER.setItem('FROTH_UPDATE_EXECUTION', 'TRUE');
+        console.log('✅ Execution details updated');
+
+    } catch (error) {
+        console.error('❌ updateExecuitonDetails error:', error.message);
+    }
 }
 
 /* ===================== UPDATE CICD / REPORT ===================== */
 
 async function update_CICDRUNID_ReportUrl(frothUrl, token, id) {
-  if (!isValidId(id)) return;
+    if (!isValidId(id)) return;
 
-  const url = `${frothUrl}/api/test-execution-update/${id}/`;
-  const formData = new FormData();
+    const url = `${frothUrl}/api/test-execution-update/${id}/`;
+    const formData = new FormData();
 
-  console.log('PUT:', url);
+    console.log('PUT:', url);
 
-  try {
-    formData.append('updated_through_bot', true);
-    formData.append('run_id', process.env.CICD_RUN_ID);
+    try {
+        formData.append('updated_through_bot', true);
+        formData.append('run_id', process.env.CICD_RUN_ID);
 
-    const reportUrl = BUFFER.getItem('REPORT_URL');
-    if (reportUrl) {
-      formData.append('report_url', reportUrl);
-    }
+        const reportUrl = BUFFER.getItem('REPORT_URL');
+        if (reportUrl) {
+            formData.append('report_url', reportUrl);
+        }
 
-    const response = await fetch(url, {
-      method: 'PUT',
-      headers: { 'Authorization': `Bearer ${token}` },
-      body: formData
-    });
+        const response = await fetch(url, {
+            method: 'PUT',
+            headers: { 'Authorization': `Bearer ${token}` },
+            body: formData
+        });
 
-    await handleResponse(response, 'update_CICDRUNID_ReportUrl');
+        await handleResponse(response, 'update_CICDRUNID_ReportUrl');
 
-  } catch (error) {
-    console.error('❌ update_CICDRUNID_ReportUrl error:', error.message);
-  }
+    } catch (error) {
+        console.error('❌ update_CICDRUNID_ReportUrl error:', error.message);
+    }
 }
 
 /* ===================== UPDATE SCRIPT STATUS ===================== */
 
 async function updateScriptExecutionStatus(
-  frothUrl,
-  token,
-  scriptid,
-  script_platform,
-  status
+    frothUrl,
+    token,
+    scriptid,
+    script_platform,
+    status
 ) {
-  if (!isValidId(scriptid)) {
-    console.error('❌ Invalid script ID');
-    return;
-  }
-
-  try {
-    const mappingId = await getExecuitonScriptDetails(
-      frothUrl,
-      token,
-      BUFFER.getItem('FROTH_EXECUTION_ID'),
-      scriptid,
-      script_platform
-    );
-
-    if (!mappingId) return;
-
-    const url = `${frothUrl}/api/script-status-percentage/${mappingId}/`;
-    const formData = new FormData();
+    if (!isValidId(scriptid)) {
+        console.error('❌ Invalid script ID');
+        return;
+    }
 
-    console.log('PUT:', url);
+    try {
+        const mappingId = await getExecuitonScriptDetails(
+            frothUrl,
+            token,
+            BUFFER.getItem('FROTH_EXECUTION_ID'),
+            scriptid,
+            script_platform
+        );
 
-    formData.append('script_status', status);
-    formData.append('updated_through_bot', true);
+        if (!mappingId) return;
 
-    const response = await fetch(url, {
-      method: 'PUT',
-      headers: { 'Authorization': `Bearer ${token}` },
-      body: formData
-    });
+        const url = `${frothUrl}/api/script-status-percentage/${mappingId}/`;
+        const formData = new FormData();
 
-    await handleResponse(response, 'updateScriptExecutionStatus');
+        console.log('PUT:', url);
 
-  } catch (error) {
-    console.error('❌ updateScriptExecutionStatus error:', error.message);
-  }
+        formData.append('script_status', status);
+        formData.append('updated_through_bot', true);
+
+        const response = await fetch(url, {
+            method: 'PUT',
+            headers: { 'Authorization': `Bearer ${token}` },
+            body: formData
+        });
+
+        await handleResponse(response, 'updateScriptExecutionStatus');
+
+    } catch (error) {
+        console.error('❌ updateScriptExecutionStatus error:', error.message);
+    }
 }
 
 /* ===================== EXPORTS ===================== */
 
 module.exports = {
-  getExecuitonDetails,
-  updateExecuitonDetails,
-  updateScriptExecutionStatus,
-  update_CICDRUNID_ReportUrl
+    getExecuitonDetails,
+    updateExecuitonDetails,
+    updateScriptExecutionStatus,
+    update_CICDRUNID_ReportUrl
 };

package/froth_configs/commonhook.js

@@ -216,13 +216,13 @@ const commonHooks = {
   },
 
   /* ==== AFTER SESSION ==== */
-  afterSession: async (config, capabilities, specs,exitCode) => {
+  afterSession: async (config, capabilities, specs, exitCode) => {
     console.log('==== AFTER SESSION ====');
     const endTime = Date.now();
     if (!suiteStartTime) suiteStartTime = endTime;
 
     const totalTime = Math.max(endTime - suiteStartTime, totalTestDuration);
-   // resultdetails.excution_status = exitCode === 0 ? 'PASSED' : 'FAILED';
+    // resultdetails.excution_status = exitCode === 0 ? 'PASSED' : 'FAILED';
     resultdetails.excution_time = msToTime(totalTime);
 
     console.log('⏱ Final execution time:', resultdetails.excution_time);
@@ -264,7 +264,30 @@ const commonHooks = {
     if (exitCode !== 0 && resultdetails.comments.length === 0) {
       resultdetails.comments.push(`Execution failed with exit code ${exitCode}`);
     }
+    // ✅ Set final status
+    resultdetails.excution_status = exitCode === 0 ? 'PASSED' : 'FAILED';
+
+    // ✅ If execution failed but no comments, add default comment
+    if (exitCode !== 0 && resultdetails.comments.length === 0) {
+      resultdetails.comments.push(`Execution failed with exit code ${exitCode}`);
+    }
+
+    // ✅ Make sure excution_time is set (if not, fallback)
+    if (!resultdetails.excution_time || resultdetails.excution_time === 'NaN:NaN:NaN') {
+      const fallbackTime = totalTestDuration || 0;
+      resultdetails.excution_time = msToTime(fallbackTime);
+    }
+
+    console.log('📤 Updating DB with final execution details');
+    console.log('Status:', resultdetails.excution_status);
+    console.log('Duration:', resultdetails.excution_time);
 
+    // await exeDetails.updateExecuitonDetails(
+    //   BUFFER.getItem('ORGANISATION_DOMAIN_URL'),
+    //   BUFFER.getItem('FROTH_LOGIN_TOKEN'),
+    //   BUFFER.getItem('FROTH_EXECUTION_ID'),
+    //   resultdetails
+    // );
     await safeUpdateExecution();
     BUFFER.clear();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "6.0.71",
+  "version": "6.0.73",
   "readme": "WendriverIO Integration with [BrowserStack](https://www.browserstack.com)",
   "description": "Selenium examples for WebdriverIO and BrowserStack App Automate",
   "scripts": {