froth-webdriverio-framework 3.0.88 → 3.0.90

package/{api → froth_api_calls}/browsersatckSessionInfo.js

@@ -106,7 +106,7 @@ async function amend2Browserstack(annotationMessage, level) {
     try {
 
         console.log("Annotation message inside amend2Browserstack:" + annotationMessage)
-        if (process.env.BROWSERSTACK)
+        if (process.env.PLATFORM === 'browserstack') 
             await driver.execute('browserstack_executor: {"action": "annotate", "arguments": {"data":"' + annotationMessage + '","level": "' + level + '"}}');
 
     } catch (error) {

package/{api → froth_api_calls}/getexecutionDetails.js

@@ -1,5 +1,5 @@
 
-const getLoginToken = require("../api/loginapi.js")
+const getLoginToken = require("./loginapi.js")
 // Function to get data from the API using the Bearer token
 
 async function getExecuitonDetails(frothUrl, token, id) {
@@ -21,12 +21,15 @@ async function getExecuitonDetails(frothUrl, token, id) {
             if (response.ok) {
                 const data = await response.json();
                 //  console.log(data)
-                jsondata.automation_suite_id = data.automation_suite_id;
-                jsondata.test_cycle_id = data.test_cycle_id;
-                if (data.testcycle_type === "Android" || data.testcycle_type === "Ios") {
-                    jsondata.device_name = data.device_name
-                    jsondata.version = data.version
-                }
+                jsondata.automation_suite_id = data.automation_suite_details.id;
+                jsondata.test_cycle_id = data.test_cycle_details.id;
+                jsondata.app_url = data.app_details ? data.app_details.app_url : null;
+                jsondata.browser_stack_local = data.capability_details ? data.capability_details.browser_stack_local: null;
+                jsondata.mediaurls =data.media_details ? data.media_details.map(media => media.media_url):null;
+
+                console.log("media urls :" + jsondata.mediaurls );
+
+
                 // console.log("json data :" + JSON.stringify(jsondata));
 
                 return jsondata;
@@ -53,7 +56,7 @@ async function getExecuitonDetails(frothUrl, token, id) {
 
 }
 
-async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_id,script_platform) {
+async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_id, script_platform) {
     let id;
     const url = `${frothUrl}/api/execution-script-mapping/?execution_id=${execution_id}&automation_script_id=${script_id}&platform=${script_platform}`;
 
@@ -151,12 +154,12 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
 
 }
 
-async function updateScriptExecutionStatus(frothUrl, token, scriptid,script_platform, status) {
+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("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();
@@ -182,7 +185,7 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid,script_plat
                 // 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);
+                return updateScriptExecutionStatus(frothUrl, newToken, scriptid, script_platform, status);
             } else {
                 const errorText = await response.text();
                 console.error(`error in updating the status into DB  ${response.status}`);

package/{api → froth_api_calls}/getsuiteDetails.js

@@ -1,5 +1,5 @@
 
-const getLoginToken=require('./loginapi')
+const getLoginToken = require('./loginapi')
 // Function to get data from the API using the Bearer token
 async function getSuiteDetails(frothUrl, token, id) {
     let jsondata = {};
@@ -18,24 +18,24 @@ async function getSuiteDetails(frothUrl, token, id) {
             });
             if (response.ok) {
                 const data = await response.json();
-               // console.log(data)
+                // console.log(data)
                 jsondata.automation_suite_id = data.id == null ? 0 : data.id;
                 jsondata.automation_suite_name = data.automation_suite_name == null ? "" : data.automation_suite_name;
                 jsondata.test_data_id = data.test_data_id == null ? 0 : data.test_data_id;
                 jsondata.browser_stack_urls = data.browser_stack_urls == null ? "" : data.browser_stack_urls;
-                jsondata.script_details=data.script_details == null ? [] : data.script_details;
-              //  console.log("automation_script_id:" + JSON.stringify(jsondata.automation_script_id))
+                jsondata.script_details = data.script_details == null ? [] : data.script_details;
+                //  console.log("automation_script_id:" + JSON.stringify(jsondata.automation_script_id))
                 const automationScripts = jsondata.script_details.reduce((obj, item) => {
                     obj[item.script_Id] = item.script_Id;
                     BUFFER.setItem(item.scriptName, item.scriptId);
-                    BUFFER.setItem(item.scriptName+"_PLATFORM", item.platform);
+                    BUFFER.setItem(item.scriptName + "_PLATFORM", item.platform);
 
-                      return obj;
+                    return obj;
                 }, {});
                 jsondata.test_sequence = data.test_sequence;
-              //  console.log("automation_script_ details:" + JSON.stringify(BUFFER))
+                //  console.log("automation_script_ details:" + JSON.stringify(BUFFER))
 
-               // console.log("json data :" + JSON.stringify(jsondata));
+                // console.log("json data :" + JSON.stringify(jsondata));
 
                 return jsondata;
 
@@ -48,7 +48,7 @@ async function getSuiteDetails(frothUrl, token, id) {
             else {
                 const errorText = await response.text();
                 console.error(`Data fetch failed response in getSuiteDetails: ${response.status}`);
-              //  throw new Error(`HTTP error! status: ${response.status}`);
+                //  throw new Error(`HTTP error! status: ${response.status}`);
             }
 
 

package/{api → froth_api_calls}/readTestdata.js

@@ -1,5 +1,5 @@
 
-const getLoginToken = require('../api/loginapi.js');
+const getLoginToken = require('./loginapi.js');
 
 
 // Function to get data from the API using the Bearer token

package/froth_common_actions/Utils.js

@@ -17,6 +17,7 @@ let swipetoFit = null;
 let swipeWithCoordinates = null;
 
 let clickIfVisible = null;
+let doubleClick = null;
 
 let assertText = null;
 let randomtext = null;
@@ -37,15 +38,15 @@ let api = null;
 
 let selectDropDownValue = null;
 
-let acceptalert = null;
-let dismissalert = null;
+let acceptAlert = null;
+let dismissAlert = null;
 
 let generateJWT=null;
 
 if (process.env.LOCATION ==null || process.env.LOCATION == 'local') {
     basepath = ".";
 } else {
-    basepath = "froth-webdriverio-framework/commonMethods";
+    basepath = "froth-webdriverio-framework/froth_common_actions";
 }
 
 scrollToEnd = require(basepath + "/scroll").scrollToEnd;
@@ -67,6 +68,7 @@ swipeWithCoordinates = require(basepath + '/swipe').swipewithcoordinates;
 
 clickIfVisible = require(basepath + "/click").clickIfVisible;
 clickByIdWithExecute = require(basepath + "/click").clickByIdWithExecute;
+doubleClick= require(basepath + "/click").doubleclick;
 
 assertText = require(basepath + '/assert').assertText;
 assertAttributeValue = require(basepath + '/assert').assertAttributeValue;
@@ -88,8 +90,8 @@ validate = require(basepath + '/apicall').validate;
 
 selectDropDownValue = require(basepath + '/dropDown').select4mDropDownValue;
 
-acceptalert = require(basepath + '/alert.js').acceptAlert;
-dismissalert = require(basepath + '/alert.js').dismissAlert;
+acceptAlert = require(basepath + '/alert.js').acceptalert;
+dismissAlert = require(basepath + '/alert.js').dismissalert;
 
 generateJWT = require(basepath + '/jwt').generateJWTToken;
 
@@ -103,6 +105,7 @@ module.exports = {
     scrollRightToView,
     clickIfVisible,
     clickByIdWithExecute,
+    doubleClick,
     assertText,
     assertAttributeValue,
     randomtext,
@@ -120,8 +123,8 @@ module.exports = {
     api,
     validate,
     selectDropDownValue,
-    acceptalert,
-    dismissalert,
+    acceptAlert,
+    dismissAlert,
     swipeLeft,
     swipeRight,
     swipeDown,

package/froth_common_actions/alert.js

@@ -1,4 +1,4 @@
-async function acceptAlert() {
+async function acceptalert() {
 
     try {
         await browser.waitUntil(async () => {
@@ -14,7 +14,7 @@ async function acceptAlert() {
 
 }
 
-async function dismissAlert() {
+async function dismissalert() {
     try {
         await browser.waitUntil(async () => {
             return await browser.isAlertOpen();
@@ -31,4 +31,4 @@ async function dismissAlert() {
 
 }
 
-module.exports = { acceptAlert, dismissAlert };
+module.exports = { acceptalert, dismissalert };

package/froth_common_actions/apicall.js

@@ -1,4 +1,4 @@
-const amendToBrowserstack = require("../api/browsersatckSessionInfo").amend2Browserstack;
+const amendToBrowserstack = require("../froth_api_calls/browsersatckSessionInfo").amend2Browserstack;
 
 async function callapi(method, api_url, queryParams, payloaddetails, authentication, headers, attachments) {
     let response;
@@ -88,8 +88,14 @@ async function validate(attribute_name, attribute, actionname, buffer, buffernam
             await validateAttributeData(attribute_name, attribute, buffer, buffername_value, datatype);
         } else if (actionname.toLowerCase() == "setbuffer") {
             BUFFER.setItem(buffername_value, attribute);
+            let annotationMessage = `The vlaue has been stored in the buffer : ${buffername_value}.`;
+            await amendToBrowserstack(annotationMessage, "info");
+
         } else if (actionname.toLowerCase() == "getbuffer") {
+            let annotationMessage = `The vlaue has been retrived from the buffer : ${buffername_value}.`;
+            await amendToBrowserstack(annotationMessage, "info");
             return BUFFER.getItem(buffername_value);
+
         }
     // } catch (e) {
     //     console.error('Error in validate method:', e);
@@ -109,19 +115,25 @@ async function validateAttributeData(attribute_name, attribute, buffer, bufferna
             valueToVerify = Number(valueToVerify);
         } else if (datatype.toLowerCase() == "boolean") {
             valueToVerify = Boolean(valueToVerify);
+        }else if (datatype.toLowerCase() == "float") {
+            valueToVerify = parseFloat(valueToVerify);
+        }else if (datatype.toLowerCase() == "double") {
+            valueToVerify = parseFloat(valueToVerify);
+        }else if (datatype.toLowerCase() == "string") {
+            valueToVerify = valueToVerify.toString();
         }
 
         expect(attribute).toBe(valueToVerify, `${attribute_name}  --> Expected value: ${valueToVerify}, but got: ${attribute}`);
         assertionStatus = true; // If assertion passes, set status to true
 
-        console.log("verification succeeded.");
-        let annotationMessage = `${attribute_name} - verification passed. Actual text: ${attribute}, Expected text: ${valueToVerify}.`;
+        console.log(`Attribute name : ${attribute_name} verification passed. Actual text: ${attribute}, Expected text: ${valueToVerify}.`);
+        let annotationMessage = `Attribute name : ${attribute_name} - verification passed. Actual text: ${attribute}, Expected text: ${valueToVerify}.`;
         await amendToBrowserstack(annotationMessage, "info");
 
     } catch (e) {
         console.error('Error in validateAttributeData:', e);
-        console.log(`${attribute_name} verification failed. Expected text: ${valueToVerify}.`);
-        let annotationMessage = `${attribute_name} - verification failed. Expected text: ${valueToVerify}.`;
+        console.log(`Attribute name : ${attribute_name} verification failed. Expected text: ${valueToVerify}. error: ${e.message}`);
+        let annotationMessage = `Attribute name : ${attribute_name} - verification failed. Expected text: ${valueToVerify}. error: ${e.message}`;
         await amendToBrowserstack(annotationMessage, "error");
 
         throw e;

package/froth_common_actions/click.js

@@ -20,7 +20,7 @@ async function clickIfVisible(elementSelector) {
   }
 }
 
-async function dobubleClick(elementSelector) {
+async function doubleclick(elementSelector) {
   try {
     let isDisplayed;
     // Wait for the element to be visible
@@ -54,4 +54,4 @@ async function clickByIdWithExecute(elementid) {
   }
 }
 
-module.exports = { clickIfVisible, clickByIdWithExecute };
+module.exports = { clickIfVisible, clickByIdWithExecute ,doubleclick};

package/froth_common_actions/jwt.js

@@ -47,18 +47,18 @@ function generateJWTToken(payload) {
 //console.log('Signed and encoded JWT', jwt)
 
 
-// function main() {
-//     // JWT Payload
-//     const payload = {
-//         iss: "YTLC_TEST_AUTOMATION_APP",
-//         iat: currentTimestamp, // Issued at
-//         exp: currentTimestamp + 200, // Expiry time: 30 seconds from issuance
-//         user_agent: {
-//             id: "janga.reddy@ytl.com"
-//         }
-//     };
+function main() {
+    // JWT Payload
+    const payload = {
+        iss: "YTLC_TEST_AUTOMATION_APP",
+        iat: currentTimestamp, // Issued at
+        exp: currentTimestamp + 200, // Expiry time: 30 seconds from issuance
+        user_agent: {
+            id: "janga.reddy@ytl.com"
+        }
+    };
 
-//     console.log('JWT signed token:', generateJWTToken(payload));
-// }
-//main()
-module.exports = { generateJWTToken}
+    console.log('JWT signed token:', generateJWTToken(payload));
+}
+main()
+//module.exports = { generateJWTToken}

package/froth_configs/commonconfig.js

@@ -2,10 +2,9 @@ const path = require('path');
 const { LocalStorage } = require('node-localstorage');
 global.BUFFER = new LocalStorage('./storage');
 const setAllDetails = require("./setallDatailinBuffer")
-const exeDetails = require("../api/getexecutionDetails")
-const getBSSessionDetails = require("../api/browsersatckSessionInfo").getBSSessionDetails;
+const exeDetails = require("../froth_api_calls/getexecutionDetails")
+const getBSSessionDetails = require("../froth_api_calls/browsersatckSessionInfo").getBSSessionDetails;
 const { fail } = require("assert");
-const { platform } = require("os");
 //const isBrowserStackEnabled = process.env.BROWSERSTACK;
 let starttime;
 let endtime;
@@ -20,7 +19,8 @@ const commonconfig = {
             // This code runs before the test suite starts
             await setAllDetails.setEnvVariables();
             await setAllDetails.setLoginToken();
-            await setAllDetails.setExecutionDetails();
+            const getExeDetails = await setAllDetails.setExecutionDetails();
+
             //  await setAllDetails.setIntegrationsDetails();
             await setAllDetails.setSuiteDetails();
             await setAllDetails.setTestDataDetails();
@@ -40,15 +40,17 @@ const commonconfig = {
 
         console.log("specdat:", specs);
         console.log("length:", specs.length);
-        // console.log("capabilities:", capabilities);
-       // capabilities.app = process.env.BROWSERSTACK_APP_PATH;
-       // capabilities['browserstack.uploadMedia'] = process.env.MEDIA_FILES;
-        //  console.log("====>",capabilities)
-        console.log(`Running tests on: ${capabilities.platformName} ${capabilities.browserName} ${capabilities.browserVersion}`);
 
+        if (process.env.PLATFORM === 'browserstack') {
+            /// console.log("capabilities:", capabilities);
+            capabilities.app = process.env.BROWSERSTACK_APP_PATH;
+            capabilities.browserstackLocal = process.env.BROWSERSTACK_LOCAL;
+            if (process.env.MEDIA_FILES)
+                capabilities['browserstack.uploadMedia'] = process.env.MEDIA_FILES;
+
+            console.log(`Running tests on after app,bslocal,mediafiles: ${capabilities}`);
+        }
 
-        // console.log('specs:', specs);
-        // console.log("Config:", config);
     },
     /**
      * Gets executed before the suite starts (in Mocha/Jasmine only).
@@ -60,9 +62,9 @@ const commonconfig = {
 
             starttime = new Date().getTime();
 
-            if (platform === 'browserstack')    
-            await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, process.env.BROWSERSTACK_ACCESS_KEY);
-            
+            if (process.env.PLATFORM === 'browserstack')
+                await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, process.env.BROWSERSTACK_ACCESS_KEY);
+
             const resultdetails = {};
             exeDetails.updateExecuitonDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("FROTH_EXECUTION_ID"), resultdetails)
 
@@ -167,7 +169,7 @@ const commonconfig = {
         let totalDuration = endtime - starttime;
         console.log("====> Total Duration in after session based on start time and end time:" + totalDuration);
 
-        if (platform === 'browserstack') 
+        if (process.env.PLATFORM === 'browserstack')
             await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, process.env.BROWSERSTACK_ACCESS_KEY);
 
         const resultdetails = {}
@@ -179,39 +181,39 @@ const commonconfig = {
         BUFFER.clear();
 
 
-            // Perform any cleanup or post-test actions here
-        },
+        // Perform any cleanup or post-test actions here
+    },
 
-        onComplete: async function (exitCode, config, capabilities, results) {
+    onComplete: async function (exitCode, config, capabilities, results) {
 
-            console.log('====> This is the onComplete hook', results);
+        console.log('====> This is the onComplete hook', results);
 
-            console.log('====> Test Results Summary ');
-            console.log('----------------------------');
+        console.log('====> Test Results Summary ');
+        console.log('----------------------------');
 
-            console.log('Total Tests:', results.total);
-            console.log('Passed:', results.passed);
-            console.log('Failed:', results.failed);
-            console.log('Skipped:', results.skipped);
-            console.log('Execution Time:', results.duration);
-            console.log('Exit Code:', exitCode);
-            console.log('====> All tests are done, exiting the browser session.');
+        console.log('Total Tests:', results.total);
+        console.log('Passed:', results.passed);
+        console.log('Failed:', results.failed);
+        console.log('Skipped:', results.skipped);
+        console.log('Execution Time:', results.duration);
+        console.log('Exit Code:', exitCode);
+        console.log('====> All tests are done, exiting the browser session.');
 
-        }
+    }
 
-    };
+};
 
-    async function secondsToTime(secs) {
-        let hours = Math.floor(secs / 3600);
-let minutes = Math.floor((secs % 3600) / 60);
-let seconds = secs % 60;
+async function secondsToTime(secs) {
+    let hours = Math.floor(secs / 3600);
+    let minutes = Math.floor((secs % 3600) / 60);
+    let seconds = secs % 60;
 
-// Adding leading zeros if the value is less than 10
-if (hours < 10) hours = '0' + hours;
-if (minutes < 10) minutes = '0' + minutes;
-if (seconds < 10) seconds = '0' + seconds;
-console.log("Time:" + hours + ':' + minutes + ':' + seconds);
-return hours + ':' + minutes + ':' + seconds;
+    // Adding leading zeros if the value is less than 10
+    if (hours < 10) hours = '0' + hours;
+    if (minutes < 10) minutes = '0' + minutes;
+    if (seconds < 10) seconds = '0' + seconds;
+    console.log("Time:" + hours + ':' + minutes + ':' + seconds);
+    return hours + ':' + minutes + ':' + seconds;
 }
 
 async function convertTimetoHHMMSS(time) {

package/froth_configs/setallDatailinBuffer.js

@@ -1,8 +1,8 @@
-const getLoginToken = require("../api/loginapi");
-const exeDetails = require("../api/getexecutionDetails")
-//const getintegrationdetails = require("../api/getintegrationDetails");
-const getSuiteDetails = require("../api/getsuiteDetails");
-const getDataById = require("../api/readTestdata");
+const getLoginToken = require("../froth_api_calls/loginapi");
+const exeDetails = require("../froth_api_calls/getexecutionDetails")
+//const getintegrationdetails = require("../froth_api_calls/getintegrationDetails");
+const getSuiteDetails = require("../froth_api_calls/getsuiteDetails");
+const getDataById = require("../froth_api_calls/readTestdata");
 
 
 async function generateBuildNumber() {
@@ -64,6 +64,9 @@ async function setExecutionDetails() {
   try {
     const getExeDetails = await exeDetails.getExecuitonDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("FROTH_EXECUTION_ID"));
     BUFFER.setItem("AUTOMATION_SUITE_ID", getExeDetails.automation_suite_id);
+    BUFFER.setItem("BROWSERSTACK_LOCAL", getExeDetails.browser_stack_local);
+    BUFFER.setItem("BROWSERSTACK_APP_PATH", getExeDetails.app_url);
+    BUFFER.setItem("MEDIA_FILES", getExeDetails.mediaurls);
 
   } catch (error) {
     //    console.error('Error in main function:', error);

package/package.json

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