froth-webdriverio-framework 3.0.49 → 3.0.50

package/commonMethods/apicall.js

@@ -11,9 +11,9 @@ async function callapi(method, api_url, queryParams, payloaddetails, authenticat
 
     if (payloaddetails && Object.keys(payloaddetails).length > 0) {
         console.log("Payload Details:", JSON.stringify(payloaddetails));
-        formData= await jsonToFormData(payloaddetails);
+        formData = await jsonToFormData(payloaddetails);
         console.log("FormData:", JSON.stringify(formData));
-       // Object.entries(payloaddetails).forEach(([key, value]) => formData.append(key, value));
+        // Object.entries(payloaddetails).forEach(([key, value]) => formData.append(key, value));
     }
 
     try {
@@ -39,22 +39,22 @@ async function callapi(method, api_url, queryParams, payloaddetails, authenticat
 }
 async function jsonToFormData(json) {
     const formData = new FormData();
-  
+
     function appendFormData(data, parentKey = '') {
-      if (data && typeof data === 'object' && !Array.isArray(data)) {
-        for (const key in data) {
-          if (data.hasOwnProperty(key)) {
-            appendFormData(data[key], parentKey ? `${parentKey}[${key}]` : key);
-          }
+        if (data && typeof data === 'object' && !Array.isArray(data)) {
+            for (const key in data) {
+                if (data.hasOwnProperty(key)) {
+                    appendFormData(data[key], parentKey ? `${parentKey}[${key}]` : key);
+                }
+            }
+        } else {
+            formData.append(parentKey, data);
         }
-      } else {
-        formData.append(parentKey, data);
-      }
     }
-  
+
     appendFormData(json);
     return formData;
-  }
+}
 
 // Function to form headers
 async function formheaders(authentication, headers) {
@@ -76,48 +76,61 @@ async function formheaders(authentication, headers) {
     return headers;
 
 }
-async function validate(attribute, actionname, buffer, value, datatype) {
-    let valueToVerify;    
+async function validate(attribute_name, attribute, actionname, buffer, buffername_value, datatype) {
 
     try {
-        let assertionStatus = false; // Initialize status
 
         if (actionname.toLowerCase() == "verify") {
-
-            //if buffer is true, get the value from buffer
-            buffer ? valueToVerify = BUFFER.getItem(value) : valueToVerify = value;
-
-            if (datatype.toLowerCase() == "integer") {
-                valueToVerify = Number(valueToVerify);
-            } else if (datatype.toLowerCase() == "boolean") {
-                valueToVerify = Boolean(valueToVerify);
-            }
-            expect(attribute).toBe(valueToVerify, `Expected value: ${valueToVerify}, but got: ${attribute}`);
-            assertionStatus = true; // If assertion passes, set status to true
-            console.log("Verification succeeded.");
-            let annotationMessage = `Verification passed. Actual text: ${attribute}, Expected text: ${valueToVerify}.`;
-            await amendToBrowserstack(annotationMessage, "info");
-
+            await validateAttributeData(attribute_name,attribute,buffer, buffername_value, datatype);
         } else if (actionname.toLowerCase() == "setbuffer") {
-            BUFFER.setItem(value, attribute);
+            BUFFER.setItem(buffername_value, attribute);
         } else if (actionname.toLowerCase() == "getbuffer") {
-            return BUFFER.getItem(value);
+            return BUFFER.getItem(buffername_value);
         }
     } catch (e) {
-        console.error('Error in validate:', e);
-        console.log(`Validation failed. Expected text: ${valueToVerify}.`);
-        let annotationMessage = `Verification failed. Expected text: ${valueToVerify}.`;
-        await amendToBrowserstack(annotationMessage, "error");
+        console.error('Error in validate method:', e);
     }
 }
 
+async function validateAttributeData(attribute_name,attribute,buffer, buffername_value, datatype) {
+    let assertionStatus = false; // Initialize status
+    let valueToVerify;
+
+    try {
+        //if buffer is true, get the value from buffer
+        buffer ? valueToVerify = BUFFER.getItem(buffername_value) : valueToVerify = buffername_value;
+
+        if (datatype.toLowerCase() == "integer") {
+            valueToVerify = Number(valueToVerify);
+        } else if (datatype.toLowerCase() == "boolean") {
+            valueToVerify = Boolean(valueToVerify);
+        }
+
+        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}.`;
+
+        if (process.env.BROWSERSTACK)
+            await amendToBrowserstack(annotationMessage, "info");
+
+    } catch (e) {
+        console.error('Error in validateAttributeData:', e);
+        console.log(`${attribute_name} Validation failed. Expected text: ${valueToVerify}.`);
+        let annotationMessage = `${attribute_name} Verification failed. Expected text: ${valueToVerify}.`;
+
+        if (process.env.BROWSERSTACK)
+            await amendToBrowserstack(annotationMessage, "error");
+    }
+}
 async function amendToBrowserstack(annotationMessage, level) {
     try {
-      await driver.execute('browserstack_executor: {"action": "annotate", "arguments": {"data":"' + annotationMessage + '","level": "' + level + '"}}');
-  
+        await driver.execute('browserstack_executor: {"action": "annotate", "arguments": {"data":"' + annotationMessage + '","level": "' + level + '"}}');
+
     } catch (error) {
-      console.error('Error occurred while verifying text:', error);
-      throw error;
+        console.error('Error occurred while annoting to BS :', error);
+        throw error;
     }
-  }
+}
 module.exports = { callapi, validate };

package/package.json

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