froth-webdriverio-framework 3.0.47 → 3.0.49

package/api/getexecutionDetails.js

@@ -53,9 +53,9 @@ async function getExecuitonDetails(frothUrl, token, id) {
 
 }
 
-async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_id) {
+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}`;
+    const url = `${frothUrl}/api/execution-script-mapping/?execution_id=${execution_id}&automation_script_id=${script_id}&platform=${script_platform}`;
 
     try {
         console.log("URL: " + url)
@@ -151,11 +151,12 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
 
 }
 
-async function updateScriptExecutionStatus(frothUrl, token, scriptid, status) {
+async function updateScriptExecutionStatus(frothUrl, token, scriptid,script_platform, status) {
 
     if (scriptid != 0) {
         try {
-            const id = await getExecuitonScriptDetails(frothUrl, token, BUFFER.getItem("FROTH_EXECUTION_ID"), scriptid)
+            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();
@@ -181,7 +182,7 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, status) {
                 // 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, id, 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/getsuiteDetails.js

@@ -28,6 +28,8 @@ async function getSuiteDetails(frothUrl, token, 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);
+
                       return obj;
                 }, {});
                 jsondata.test_sequence = data.test_sequence;

package/commonMethods/apicall.js

@@ -95,7 +95,6 @@ async function validate(attribute, actionname, buffer, value, datatype) {
             expect(attribute).toBe(valueToVerify, `Expected value: ${valueToVerify}, but got: ${attribute}`);
             assertionStatus = true; // If assertion passes, set status to true
             console.log("Verification succeeded.");
-            actualText = await element.getText();
             let annotationMessage = `Verification passed. Actual text: ${attribute}, Expected text: ${valueToVerify}.`;
             await amendToBrowserstack(annotationMessage, "info");
 
@@ -106,8 +105,8 @@ async function validate(attribute, actionname, buffer, value, datatype) {
         }
     } catch (e) {
         console.error('Error in validate:', e);
-        console.log(`Validation failed. Expected text: ,${valueToVerify}.`);
-        let annotationMessage = `Verification failed. Expected text: ,${valueToVerify}.`;
+        console.log(`Validation failed. Expected text: ${valueToVerify}.`);
+        let annotationMessage = `Verification failed. Expected text: ${valueToVerify}.`;
         await amendToBrowserstack(annotationMessage, "error");
     }
 }

package/config/commonconfig.js

@@ -102,10 +102,13 @@ const commonconfig = {
             // scriptresult = "FAILED"
         }
         let scriptid = BUFFER.getItem(fileName.replace(".js", ""))
+        let script_platform = BUFFER.getItem(fileName.replace(".js", "")+"_PLATFORM")
+
         await exeDetails.updateScriptExecutionStatus(
             BUFFER.getItem("ORGANISATION_DOMAIN_URL"),
             BUFFER.getItem("FROTH_LOGIN_TOKEN"),
             scriptid,
+            script_platform.toLowerCase(),
             scriptresult)
 
     },

package/package.json

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