froth-webdriverio-framework 6.0.74 → 6.0.76

package/froth_api_calls/browsersatckSessionInfo.js

@@ -1,20 +1,16 @@
-
-async function getBSBuildDetails(sessiontype, bs_username, bs_pwd) {
+async function getBSBuildDetails(sessionType, bsUsername, bsPassword) {
     try {
-        // const sessionId = sessionIdd;
-        console.log("sessiontype:" + sessiontype)
-        const username = bs_username;
-        const accessKey = bs_pwd;
-        console.log("accessKey:" + accessKey)
-        const basicAuth = btoa(`${username}:${accessKey}`);
+        console.log(`Session type: ${sessionType}`);
 
-        let hashed_id = null;
+        const basicAuth = btoa(`${bsUsername}:${bsPassword}`);
+        const buildName = sessionType === 'app-automate'
+            ? `Mobile_Build-${process.env.FROTH_TESTOPS_BUILD_NAME}`
+            : `Web_Build-${process.env.FROTH_TESTOPS_BUILD_NAME}`;
 
-        // const sessionid= BUFFER.getItem("SESSION_ID");
-        console.log("Browsersatck build name :" + process.env.FROTH_TESTOPS_BUILD_NAME)
-        const url = `https://api.browserstack.com/${sessiontype}/builds.json?name=${process.env.FROTH_TESTOPS_BUILD_NAME}`;
+        console.log(`BrowserStack build name: ${buildName}`);
 
-        console.log("url:" + url)
+        const url = `https://api.browserstack.com/${sessionType}/builds.json?name=${buildName}`;
+        console.log(`URL: ${url}`);
 
         const response = await fetch(url, {
             method: 'GET',
@@ -25,47 +21,34 @@ async function getBSBuildDetails(sessiontype, bs_username, bs_pwd) {
 
         if (response.ok) {
             const data = await response.json();
-            console.log("session build_data:" + JSON.stringify(data))
-            // Accessing the public_url property
-            hashed_id = data[0].automation_build.hashed_id;
-
-            return hashed_id;
-        } else if (response.status === 401) { // 
-            console.log("Unauthorized, token expired")
+            console.log(`Build data: ${JSON.stringify(data)}`);
 
+            return data[0].automation_build.hashed_id;
+        } else if (response.status === 401) {
+            console.error("Unauthorized: token expired to login Browserstack for getting session info");
         } else {
             const errorText = await response.text();
-            console.error(`Data fetch failed response in getBSBuildDetails:${response.status}`);
-            // console.error(`Data fetch failed response in getBSBuildDetails:${errorText}`);
-            // throw new Error(`HTTP error! status: ${response.status}`);
+            console.error(`Failed to fetch build details: ${response.status}, ${errorText}`);
         }
 
-
-
     } catch (error) {
-        console.error('Error fetching data:', error);
-
+        console.error('Error fetching build details:', error);
     }
-
-
 }
 
-async function getBSSessionDetails(sessiontype, bs_username, bs_pwd) {
+async function getBSSessionDetails(sessionType, bsUsername, bsPassword) {
     try {
-        // const sessionId = sessionIdd;    
-        const username = bs_username;
-        //  const accessKey = Buffer.from(bs_pwd, 'base64').toString('utf-8');
-        const accessKey = bs_pwd;
+        const basicAuth = btoa(`${bsUsername}:${bsPassword}`);
+        const hashId = await getBSBuildDetails(sessionType, bsUsername, bsPassword);
 
-        const basicAuth = btoa(`${username}:${accessKey}`);
+        if (!hashId) {
+            console.error("Build hash ID not found. Cannot fetch session details.");
+            return;
+        }
 
-        const hash_id = await getBSBuildDetails(sessiontype, bs_username, accessKey)
-        //  const sessionid = BUFFER.getItem("SESSION_ID");
-        console.log("hash_id" + hash_id)
+        const url = `https://api.browserstack.com/${sessionType}/builds/${hashId}/sessions.json`;
+        console.log(`URL: ${url}`);
 
-        // const url = `https://api.browserstack.com/${sessiontype}/sessions/${sessionid}.json`;
-        const url = `https://api.browserstack.com/${sessiontype}/builds/${hash_id}/sessions.json`;
-        console.log("url:" + url)
         const response = await fetch(url, {
             method: 'GET',
             headers: {
@@ -75,71 +58,39 @@ async function getBSSessionDetails(sessiontype, bs_username, bs_pwd) {
 
         if (response.ok) {
             const data = await response.json();
-
-            // Accessing the public_url property
             const publicUrl = data[0].automation_session.public_url;
             const duration = data[0].automation_session.duration;
-            BUFFER.setItem("REPORT_URL", publicUrl)
-            BUFFER.setItem("FROTH_TOTAL_DURATION", duration)
-            console.log("public url:" + publicUrl)
-            //return jsondata;
-        } else if (response.status === 401) { // 
-            console.log("Unauthorized, token expired")
 
+            BUFFER.setItem("REPORT_URL", publicUrl);
+            BUFFER.setItem("FROTH_TOTAL_DURATION", duration);
+
+            console.log(`Public URL: ${publicUrl}`);
+        } else if (response.status === 401) {
+            console.error("Unauthorized: token expired to login Browserstack");
         } else {
             const errorText = await response.text();
-            console.error(`Data fetch failed response in getBSSessionDetails :${response.status}`);
-            // throw new Error(`HTTP error! status: ${response.status}`);
+            console.error(`Failed to fetch session details: ${response.status}, ${errorText}`);
         }
 
-
-
     } catch (error) {
-        console.error('Error fetching data:', error);
-
+        console.error('Error fetching session details:', error);
     }
-
-
 }
 
 async function amend2Browserstack(annotationMessage, level) {
     try {
-
-        console.log("Annotation message inside amend2Browserstack:" + annotationMessage)
-        if (process.env.PLATFORM === 'browserstack')
-            await driver.execute('browserstack_executor: {"action": "annotate", "arguments": {"data":"' + annotationMessage + '","level": "' + level + '"}}');
-
+        console.log(`Annotation message: ${annotationMessage}`);
+        if (process.env.PLATFORM === 'browserstack') {
+            await driver.execute(`browserstack_executor: {"action": "annotate", "arguments": {"data":"${annotationMessage}","level": "${level}"}}`);
+        }
     } catch (error) {
-        console.error('Error occurred while annoting to BS :', error);
+        console.error('Error annotating BrowserStack session:', error);
         throw error;
     }
 }
 
-
-
-
-// Execute the main function
-
-// Main function to execute the API call
-// async function main() {
-//     try {
-//        /// BUFFER.setItem("EXECUTION_SESSIONID","297666e2fd4195de98d7da3b359669072ff41a2a");
-//        const login=0.30;
-//        const landing=0.30;
-//        const home=0.30;
-//        const payment=0.30;
-
-
-//         await amend2Browserstack("\n Page load time for login page:"+login+"\n Page load time for landing page:"+landing+"\n Page load time for home page:"+home+"\n Page load time for payment page:"+payment, "info");
-//     } catch (error) {
-//         console.error('Error in main function:', error);
-//     }
-// }
-
-// main();
 module.exports = {
     getBSSessionDetails,
     getBSBuildDetails,
     amend2Browserstack,
 };
-

package/froth_configs/browserstack/mobile.config.js

@@ -29,7 +29,7 @@ module.exports = (bsCaps) => {
             platformName: bsCaps.platformName || 'Android',
             'bstack:options': {
                 // projectName: 'BrowserStack Samples',
-               // buildName: 'Mobile_Build-',
+                buildName: 'Mobile_Build-',
               //  sessionName: 'Mobile Test',
                 deviceName: bsCaps.deviceName || 'Samsung Galaxy S22 Ultra',
                 osVersion: bsCaps.platformVersion || '12.0',

package/froth_configs/browserstack/web.config.js

@@ -31,7 +31,7 @@ module.exports = (bsCaps) => {
             'bstack:options': {
                 os: bsCaps.os,
                 osVersion: bsCaps.osVersion,
-               // buildName: 'Web_Build-',
+                buildName: 'Web_Build-',
                 debug: bsCaps.debug,
                 networkLogs: bsCaps.networkLogs,
                 interactiveDebugging: bsCaps.interactiveDebugging,

package/froth_configs/commonhook.js

@@ -3,7 +3,7 @@ const setAllDetails = require('./setallDatailinBuffer');
 const exeDetails = require('../froth_api_calls/getexecutionDetails');
 const { getBSSessionDetails } = require('../froth_api_calls/browsersatckSessionInfo');
 let globalErrorHandled = false;
-let suiteStartTime;
+let suiteStartTime = 0;
 let totalTestDuration = 0;
 const url = require('url');
 const fs = require('fs');
@@ -59,7 +59,7 @@ async function safeUpdateExecution() {
 }
 
 /* ----------------- HELPER FUNCTIONS ----------------- */
-function msToTime(ms) {
+async function msToTime(ms) {
   if (!ms || isNaN(ms)) return '00:00:00';
 
   let seconds = Math.floor(ms / 1000);
@@ -87,9 +87,11 @@ const commonHooks = {
 
   /* ========== ON PREPARE ========== */
   onPrepare: async () => {
+    suiteStartTime = Date.now();
     registerGlobalErrorHandlers();
 
     console.log('==== ON PREPARE HOOK ====');
+
     await setAllDetails.setEnvVariables();
     await setAllDetails.setExecutionDetails();
     await setAllDetails.setSuiteDetails();
@@ -150,6 +152,8 @@ const commonHooks = {
       console.log('final cinfig dteials :' + JSON.stringify(capabilities))
 
       console.log("config details " + JSON.stringify(config))
+      process.env.BROWSERSTACK_USERNAME = config.userName
+      process.env.BROWSERSTACK_ACCESS_KEY = config.accessKey
 
 
     } catch (error) {
@@ -184,6 +188,7 @@ const commonHooks = {
   /* ========== AFTER TEST ========== */
   afterTest: async (test, _, { error, duration, passed }) => {
     console.log(`==== AFTER TEST HOOK ===='${test.title}'`);
+    if (!totalTestDuration) totalTestDuration = 0;
     totalTestDuration += duration;
 
     const fileName = path.basename(test.file);
@@ -191,7 +196,8 @@ const commonHooks = {
 
     if (!passed) {
       resultdetails.comments.push(`${test.title} - ${error?.message || 'Failed'}`);
-    }
+    }else
+      resultdetails.comments.push(`${test.title} - 'Passed'}`);
 
     const suiteDetails = JSON.parse(BUFFER.getItem('FROTHE_SUITE_DETAILS'));
     const script = suiteDetails.find(s => s.scriptName === fileName.replace('.js', ''));
@@ -220,21 +226,7 @@ const commonHooks = {
     console.log('==== AFTER SESSION ====');
     // Do not calculate time here; we will use WDIO's total duration in onComplete
     console.log('⏱ Leaving execution time calculation for onComplete hook');
-    // const endTime = Date.now();
-    // if (!suiteStartTime) suiteStartTime = endTime;
-
-    // const totalTime = Math.max(endTime - suiteStartTime, totalTestDuration);
-    // // resultdetails.excution_status = exitCode === 0 ? 'PASSED' : 'FAILED';
-    // resultdetails.excution_time = msToTime(totalTime);
-
-    // console.log('⏱ Final execution time:', resultdetails.excution_time);
-
-    // console.log('📤 Updating DB with final execution details');
-    // console.log('Status:', resultdetails.excution_status);
-    // console.log('Duration:', resultdetails.excution_time);
-
-    // await safeUpdateExecution();
-    // BUFFER.clear();
+    
   },
 
   /* ========== ON ERROR ========== */
@@ -258,34 +250,24 @@ const commonHooks = {
   },
   /* ========== ON COMPLETE ========== */
   onComplete: async (exitCode, _, __, results) => {
-    console.log('==== ON COMPLETE ====');
     console.log('==== ON COMPLETE ====');
     console.log(`Total: ${results.total || 0}, Passed: ${results.passed || 0}, Failed: ${results.failed || 0}`);
 
-    // Status
-    resultdetails.excution_status = exitCode === 0 ? 'PASSED' : 'FAILED';
+    const endTime = Date.now();
+    const totalTime = endTime - suiteStartTime; // Full WDIO+CI elapsed time
 
-    // Execution time using WDIO's internal duration (in ms)
-    const totalDuration = results._duration || 0;
-    resultdetails.excution_time = msToTime(totalDuration);
-    console.log('⏱ Final execution time (ms):', totalDuration);
-    console.log('⏱ Final execution time (hh:mm:ss):', resultdetails.excution_time);
+    resultdetails.excution_time = await msToTime(totalTime);
+    resultdetails.excution_status = exitCode === 0 ? 'PASSED' : 'FAILED';
 
-    // Add generic failure comment if exitCode != 0 and no comments yet
     if (exitCode !== 0 && resultdetails.comments.length === 0) {
       resultdetails.comments.push(`Execution failed with exit code ${exitCode}`);
     }
 
-    // Update DB
-    console.log('📤 Updating DB with final execution details');
-    console.log('Status:', resultdetails.excution_status);
-    console.log('Duration:', resultdetails.excution_time);
-    console.log('Comments:', resultdetails.comments.join('; '));
+    console.log('⏱ Final execution time (ms):', totalTime);
+    console.log('⏱ Final execution time (hh:mm:ss):', resultdetails.excution_time);
 
     await safeUpdateExecution();
     BUFFER.clear();
-
-
     return exitCode;
   },
 

package/froth_configs/wdio.common.conf.js

@@ -18,6 +18,7 @@ try {
   }
   const ymlPath = path.resolve(process.cwd(), configFile);
   bsCaps = yaml.load(fs.readFileSync(ymlPath, 'utf8'));
+ 
   // Merge chrome-specific options if applicable
 
 } catch (e) {

package/package.json

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