froth-webdriverio-framework 4.0.36 → 4.0.38

package/froth_api_calls/getexecutionDetails.js

@@ -38,7 +38,9 @@ async function getExecuitonDetails(frothUrl, token, id) {
                 // 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 getExecuitonDetails(frothUrl, newToken, id);
-                console.log("Unauthorized, token expired" + response.status)
+                // console.log("Unauthorized, token expired" + response.status)
+                console.error("Unauthorized, token expired" + response.status);
+
             } else {
                 const errorText = await response.text();
                 console.error(`Data fetch failed response in getExecuitonDetails: ${response.status}`);
@@ -103,8 +105,7 @@ async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_i
 
 }
 
-async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
-    // if (id != 0) {
+async function update_CICDRUNID_ReportUrl(frothUrl, token, id) {
 
 
     const url = `${frothUrl}/api/test-execution-update/${id}/`;
@@ -112,26 +113,17 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
     try {
         console.log("URL" + url)
 
-        if (resultdetails.excution_status != null) {
-            formData.append('excution_status', resultdetails.excution_status);
-        }
-        if (resultdetails.excution_time != null) {
-            formData.append('excution_time', resultdetails.excution_time);
-        }
-        formData.append('id', BUFFER.getItem("FROTH_EXECUTION_ID"))
-        if (BUFFER.getItem("REPORT_URL") != null)
-            formData.append('report_url', BUFFER.getItem("REPORT_URL"))
-        
+       // formData.append('id', BUFFER.getItem("FROTH_EXECUTION_ID"))
         formData.append('updated_through_bot', true)
         formData.append('run_id', process.env.CICD_RUN_ID)
-        if (resultdetails.comments != null)
-            formData.append('comments', resultdetails.comments.join('<br>'))
-
-           // formData.append('comments', JSON.stringify(resultdetails.comments))
-
-        console.log("Report URL:" + BUFFER.getItem("REPORT_URL"))
 
 
+        if (BUFFER.getItem("REPORT_URL") === null)
+            console.log("Report URL is null")
+        else {
+            console.log("Report URL:" + BUFFER.getItem("REPORT_URL"))
+            formData.append('report_url', BUFFER.getItem("REPORT_URL"))
+        }
 
         const response = await fetch(url, {
             method: 'PUT',
@@ -144,33 +136,137 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
 
         if (response.ok) {
             const data = await response.json();
-            //  console.log("data is :"+data)
-
         } 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 updateExecuitonDetails(frothUrl, newToken, id, resultdetails);
             console.log("Unauthorized, token expired" + response.status)
-
         } else {
             const errorText = await response.text();
             console.error(`error in updating the status into DB  ${response.status}`);
-            // throw new Error(`HTTP error! status: ${response.status}`);
         }
 
-
-
     } catch (error) {
         console.error('Error fetching data:', error);
 
     }
-    // } else {
-    //     console.error('Error fetching data: Invalid ID');
-    // }
+
 
 }
 
+async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
+    if (BUFFER.getItem("UPDATE_EXECUTION") === 'TRUE') {
+        console.log("Execution already updated.")
+    }
+    else {
+
+        const url = `${frothUrl}/api/test-execution-update/${id}/`;
+        const formData = new FormData();
+        try {
+            console.log("URL" + url)
+
+            //formData.append('id', BUFFER.getItem("FROTH_EXECUTION_ID"))
+            formData.append('updated_through_bot', true)
+            // formData.append('run_id', process.env.CICD_RUN_ID)
+
+            if (resultdetails.excution_status === null) {
+                console.log("Execution status is null")
+            } else
+                formData.append('excution_status', resultdetails.excution_status);
+
+            if (resultdetails.excution_time === null || resultdetails.excution_time === "NaN:NaN:NaN") {
+                console.log("Execution time is null")
+            } else
+                formData.append('excution_time', resultdetails.excution_time);
+
+
+            if (resultdetails.comments === null)
+                console.log("Comments is null")
+            else if (resultdetails.comments.length === 0)
+                console.log("Comments is empty")
+            else
+                formData.append('comments', resultdetails.comments.join('<br>'))
+
+            // formData.append('comments', JSON.stringify(resultdetails.comments))
+
+            const response = await fetch(url, {
+                method: 'PUT',
+                headers: {
+                    'Authorization': `Bearer ${token}`
+                },
+                body: formData
+
+            });
+
+            if (response.ok) {
+                const data = await response.json();
+                BUFFER.setItem("UPDATE_EXECUTION", 'TRUE')
+            } else if (response.status === 401) { // Unauthorized, token expired
+                console.log("Unauthorized, token expired" + response.status)
+            } else {
+                const errorText = await response.text();
+                console.error(`error in updating the status into DB  ${response.status}`);
+                // throw new Error(`HTTP error! status: ${response.status}`);
+            }
+
+        } catch (error) {
+            console.error('Error fetching data:', error);
+
+        }
+       
+    }
+}
+
+
+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}/`;
+            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)
+
+            const response = await fetch(url, {
+                method: 'PUT',
+                headers: {
+                    'Authorization': `Bearer ${token}`
+                },
+                body: formData
+
+            });
+
+            if (response.ok) {
+                const data = await response.json();
+                //  console.log("data is :"+data)
+
+            } 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}`);
+                // throw new Error(`HTTP error! status: ${response.status}`);
+            }
+
+
+
+        } catch (error) {
+            console.error('Error updating data for script status:', error);
+
+        }
+    } else {
+        console.error('Else: Error updating data for script status: Invalid ID');
+    }
+
+}
 async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_platform, status) {
 
     if (scriptid != 0) {
@@ -253,5 +349,5 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_pla
 // }
 
 // main();
-module.exports = { getExecuitonDetails, updateExecuitonDetails, updateScriptExecutionStatus };
+module.exports = { getExecuitonDetails, updateExecuitonDetails, updateScriptExecutionStatus, update_CICDRUNID_ReportUrl };
 

package/froth_common_actions/jwt.js

@@ -54,11 +54,11 @@ function main() {
         iat: currentTimestamp, // Issued at
         exp: currentTimestamp + 200, // Expiry time: 30 seconds from issuance
         user_agent: {
-            id: "kartikaypriya.p@ytlcomms.my"
+            id: "janga.reddy@ytl.com"
         }
     };
 
     console.log('JWT signed token:', generateJWTToken(payload));
 }
-//main()
+main()
 module.exports = { generateJWTToken}

package/froth_configs/commonconfig.js

@@ -126,7 +126,8 @@ const commonconfig = {
 
 
             // const resultdetails = {};
-            await exeDetails.updateExecuitonDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("FROTH_EXECUTION_ID"), resultdetails)
+            await exeDetails.update_CICDRUNID_ReportUrl(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("FROTH_EXECUTION_ID"))
+            BUFFER.setItem("UPDATE_EXECUTION", 'FALSE')
 
         } catch (e) {
             console.log("Error in beforeSuite:", e);
@@ -142,9 +143,7 @@ const commonconfig = {
 
         console.log('==== BEFORE TEST HOOK ====');
         console.log(`====> Test Started '${test.title}'`);
-       // browser.testErrors = [];
-        // console.log("File Name:", test.file);
-
+      
     },
 
 
@@ -171,21 +170,7 @@ const commonconfig = {
         let scriptresult = "NOT RUN";
         // Default assumption: test passed (unless soft assertion failed)
         let finalPassed = passed;
-       // let combinedError = error;
-
-        // Check soft assertion failures
-        // const softErrors = browser.testErrors || [];
-        // if (softErrors.length > 0) {
-        //     finalPassed = false; // Override status
-        //     const softErrorMessage = `Soft assertion errors: ${softErrors.join('<br>')}`;
-        //     console.log('====> Soft Assertion Failures Detected:\n' + softErrorMessage);
-
-        //     // Log in resultdetails
-        //     resultdetails.comments.push(`${test.title} - failed: ${softErrorMessage}`);
-        //     global.__SOFT_FAIL__ = true;
-        //     // Overwrite the error param so your logic can pick it up
-        //     combinedError = new Error(softErrorMessage);
-        // }
+       
         if (passed) {
             scriptresult = "PASSED"
             resultdetails.comments.push(`${test.title} - passed`);
@@ -211,10 +196,7 @@ const commonconfig = {
             jwtScript.scriptId,
             jwtScript.platform.toLowerCase(),
             scriptresult)
-        // ✅ Force test failure if soft errors exist
-        // if (softErrors.length > 0) {
-        //     throw combinedError; // 👈 this is what forces the test to fail in WDIO
-        // }
+       
 
     },
     /**
@@ -303,10 +285,7 @@ const commonconfig = {
         console.log('Execution Time:', results.duration);
         console.log('Exit Code:', exitCode);
         console.log('==== ALL TESTS ARE COMPLETED ====');
-        // if (global.__SOFT_FAIL__) {
-        //     console.log('❌ One or more tests failed due to soft assertion.');
-        //     process.exit(1); // ✅ Force failure
-        // }
+    
 
         return exitCode;
     }
@@ -333,6 +312,7 @@ async function convertTimetoHHMMSS(time) {
     const formattedTime = `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`;
 
     console.log("Time:" + hours + ':' + minutes + ':' + seconds);
+
     return formattedTime;
 }
 

package/package.json

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