froth-webdriverio-framework 5.0.14 → 5.0.16

package/froth_api_calls/getexecutionDetails.js

@@ -170,7 +170,6 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
             } else
                 formData.append('excution_time', resultdetails.excution_time);
 
-
             if (resultdetails.comments === null)
                 console.log("Comments is null")
             else if (resultdetails.comments.length === 0)
@@ -178,6 +177,7 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
             else
                 formData.append('comments', resultdetails.comments.join('<br>'))
 
+
             // formData.append('comments', JSON.stringify(resultdetails.comments))
 
             const response = await fetch(url, {
@@ -255,20 +255,20 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_pla
     }
 
 }
-async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_platform, status) {
-
-    if (scriptid != 0) {
-        try {
-            console.log("script platform is " + script_platform)
-            const id = await getExecuitonScriptDetails(frothUrl, token, BUFFER.getItem("FROTH_EXECUTION_ID"), scriptid, script_platform)
-            console.log("ID is :" + id)
-            const url = `${frothUrl}/api/script-status-percentage/${id}/`;
+async function updateReportUrl(frothUrl, token, id) {
+    try {
+        console.log("in update execution details UPDATE_EXECUTION: " + BUFFER.getItem("UPDATE_EXECUTION"))
+        if (BUFFER.getItem("FROTH_UPDATE_EXECUTION") === 'TRUE') {
+            console.log("Execution already updated.")
+        }
+        else {
+            const url = `${frothUrl}/api/test-execution-update/${id}/`;
             const formData = new FormData();
 
             console.log("URL" + url)
-            // formData.append('execution_id', BUFFER.getItem("EXECUTION_ID"))
-            formData.append('script_status', status)
             formData.append('updated_through_bot', true)
+            formData.append('report_url', `reports/${process.env.EXECUTION_ID}/test-report.html`)
+
 
             const response = await fetch(url, {
                 method: 'PUT',
@@ -281,15 +281,9 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_pla
 
             if (response.ok) {
                 const data = await response.json();
-                //  console.log("data is :"+data)
-
+                BUFFER.setItem("FROTH_UPDATE_EXECUTION", 'TRUE')
             } else if (response.status === 401) { // Unauthorized, token expired
-                // Call login function to obtain a new token
-                // const newToken = await getLoginToken(BUFFER.getItem("SERVICE_USER"), BUFFER.getItem("SERVICE_PASSWORD")); // You need to implement the login function
-                // // Retry the request with the new token
-                // return updateScriptExecutionStatus(frothUrl, newToken, scriptid, script_platform, status);
                 console.log("Unauthorized, token expired" + response.status)
-
             } else {
                 const errorText = await response.text();
                 console.error(`error in updating the status into DB  ${response.status}`);
@@ -297,13 +291,10 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_pla
             }
 
 
-
-        } catch (error) {
-            console.error('Error updating data for script status:', error);
-
         }
-    } else {
-        console.error('Else: Error updating data for script status: Invalid ID');
+    } catch (error) {
+        console.error('Error in update report url :', error);
+
     }
 
 }
@@ -337,5 +328,5 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_pla
 // }
 
 // main();
-module.exports = { getExecuitonDetails, updateExecuitonDetails, updateScriptExecutionStatus, update_CICDRUNID_ReportUrl };
+module.exports = { getExecuitonDetails, updateExecuitonDetails, updateScriptExecutionStatus, update_CICDRUNID_ReportUrl, updateReportUrl};
 

package/froth_configs/commonconfig.js

@@ -9,7 +9,7 @@ const exeDetails = require("../froth_api_calls/getexecutionDetails")
 const { fail } = require("assert");
 const { error } = require('console');
 const HTMLReportGenerator = require('wdio-json-html-reporter').HTMLReportGenerator;
-
+global.Util=require('../froth_common_actions/Utils');
 
 //const isBrowserStackEnabled = process.env.BROWSERSTACK;
 let starttime;
@@ -46,6 +46,7 @@ const commonconfig = {
     beforeSession: async function (config, capabilities, specs) {
         try {
 
+
             let syntaxFailed = false;
 
             console.log('==== BEFORE SESSION HOOK ====');
@@ -391,6 +392,10 @@ const commonconfig = {
 
         const reportGenerator = new HTMLReportGenerator(outputFilePath, historyFile);
         await reportGenerator.convertJSONFolderToHTML(jsonFolder);
+       
+        await exeDetails.updateReportUrl(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("FROTH_EXECUTION_ID"))
+
+
         // return exitCode;
     }
 

package/froth_configs/wdio-require-patch.js

@@ -0,0 +1,47 @@
+/**
+ * wdio-require-patch.js
+ * This script patches Node's require() so that any test file requiring
+ * '../B/froth_common_actions/Utils' automatically gets the correct global Util object.
+ */
+
+const path = require('path');
+const fs = require('fs');
+const Module = require('module');
+console.log('🔧  Applying wdio-require-patch.js...');
+// --- 1️⃣ Locate the correct Utils.js dynamically ---
+const possiblePaths = [
+  // Local project structure    
+  path.resolve(__dirname, '../B/froth_common_actions/Utils.js'),
+  path.resolve(__dirname, '../node_modules/froth-webdriverio-framework/froth_common_actions/Utils.js'),
+
+  // Cloud structure (when framework is inside node_modules)
+  path.resolve(__dirname, './node_modules/froth-webdriverio-framework/froth_common_actions/Utils.js'),
+
+  // Fallback (when running inside another workspace)
+  path.resolve(process.cwd(), 'node_modules/froth-webdriverio-framework/froth_common_actions/Utils.js'),
+];
+
+const utilsPath = possiblePaths.find(p => fs.existsSync(p));
+
+if (!utilsPath) {
+  console.warn('⚠️  Could not find Utils.js in expected paths. Global.Util not set.');
+} else {
+  global.Util = require(utilsPath);
+  console.log(`✅  Global Util loaded from: ${utilsPath}`);
+}
+
+// --- 2️⃣ Patch Node's require() so that any require of Utils returns global.Util ---
+const originalRequire = Module.prototype.require;
+
+Module.prototype.require = function (request) {
+  // Catch any variation of the Utils import
+  if (
+    request.includes('froth_common_actions/Utils') ||
+    request.endsWith('/Utils') ||
+    request.endsWith('/Utils.js')
+  ) {
+    console.log(`⚡  Redirecting require('${request}') → global.Util`);
+    return global.Util;
+  }
+  return originalRequire.apply(this, arguments);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "5.0.14",
+  "version": "5.0.16",
   "readme": "WebdriverIO Integration",
   "description": "WebdriverIO and BrowserStack App Automate",
   "license": "MIT",