froth-webdriverio-framework 2.0.24 → 2.0.26

package/api/getDBdetails.js

@@ -6,7 +6,7 @@ async function getDbDetails(frothUrl, token, id) {
 
     let jsondata = {};
     if (id != 0 || id != null || id != undefined) {
-        const url = `https://${frothUrl}/api/dbconnection-retrieve/${id}/`;
+        const url = `${frothUrl}/api/dbconnection-retrieve/${id}/`;
 
         try {
             console.log("URL: " + url)

package/api/getexecutionDetails.js

@@ -5,7 +5,7 @@ const getLoginToken = require("../api/loginapi.js")
 async function getExecuitonDetails(frothUrl, token, id) {
     let jsondata = {};
     if (id != 0 || id != null || id != undefined) {
-        const url = `https://${frothUrl}/api/test-execution-retrieve/${id}`;
+        const url = `${frothUrl}/api/test-execution-retrieve/${id}`;
 
         try {
             console.log("URL: " + url)
@@ -55,7 +55,7 @@ async function getExecuitonDetails(frothUrl, token, id) {
 
 async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_id) {
     let id;
-    const url = `https://${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}`;
 
     try {
         console.log("URL: " + url)
@@ -100,7 +100,7 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
     if (id != 0) {
 
 
-        const url = `https://${frothUrl}/api/test-execution-update/${id}/`;
+        const url = `${frothUrl}/api/test-execution-update/${id}/`;
         const formData = new FormData();
         try {
             console.log("URL" + url)
@@ -155,7 +155,7 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, status) {
     if (scriptid != 0) {
         try {
             const id = await getExecuitonScriptDetails(frothUrl, token, BUFFER.getItem("EXECUTION_ID"), scriptid)
-            const url = `https://${frothUrl}/api/script-status-percentage/${id}/`;
+            const url = `${frothUrl}/api/script-status-percentage/${id}/`;
             const formData = new FormData();
 
             console.log("URL" + url)

package/api/getintegrationDetails.js

@@ -3,7 +3,7 @@
 async function getintegrationdetails(frothUrl, token, id) {
     let jsondata = {};
     if (id != 0 || id != null || id != undefined) {
-        const url = `https://${frothUrl}/api/intergration-view/${id}/`;
+        const url = `${frothUrl}/api/intergration-view/${id}/`;
 
         try {
             console.log("URL: " + url)

package/api/getsuiteDetails.js

@@ -4,7 +4,7 @@ const getLoginToken=require('./loginapi')
 async function getSuiteDetails(frothUrl, token, id) {
     let jsondata = {};
     if (id != 0 || id != null || id != undefined) {
-        const url = `https://${frothUrl}/api/automationsuite-retrieve/${id}/`;
+        const url = `${frothUrl}/api/automationsuite-retrieve/${id}/`;
 
         try {
             console.log("URL: " + url)

package/api/loginapi.js

@@ -4,7 +4,7 @@
 
 async function getLoginToken(frothUrl, email, password) {
     try {
-        const url = `https://${frothUrl}/api/login/`;
+        const url = `${frothUrl}/api/login/`;
         console.log("URL: " + url);
         const formData = new FormData();
         formData.append('email_or_username', email);
@@ -37,12 +37,14 @@ async function getLoginToken(frothUrl, email, password) {
 // async function main() {
 //     try {
 //         const frothUrl = "devapi.frothtestops.com";
-//         const username = "subhra.subudhi@roboticodigital.com";
-//         const password = "V2VsY29tZUAxMjM=";
+//         const username = "frothbot@roboticodigital.com";
+//         const password = "RnJvdGh0ZXN0b3BzQDU1NQ==";
 
 //         const token = await getLoginToken(frothUrl, username, password);
 //         if (!token) {
 //             throw new Error('Login failed, no token obtained');
+//         }else{
+//             console.log(token)
 //         }
 
 

package/api/readTestdata.js

@@ -6,7 +6,7 @@ const getLoginToken = require('../api/loginapi.js');
 async function getDataById(frothUrl, token, id) {
 
     if (id != 0 || id != null || id != undefined|| id != "null")  {
-        const url = `https://${frothUrl}/api/testdata-retrieve/${id}/`;
+        const url = `${frothUrl}/api/testdata-retrieve/${id}/`;
 
         try {
             console.log("URL: " + url)

package/commonMethods/assertText.js

@@ -7,22 +7,23 @@ async function assertText(driver, elementSelector, expectedText) {
     // Wait for the element to be visible
 
     // Get the actual text from the element
-   // const element = await driver.$(elementSelector);
-   // console.log("actual text is:" + element)
-    const actualText = await driver.$(elementSelector).getText();
-   // const actualText = await element.getText();
-    console.log("actual text is:" + actualText)
+    // const element = await driver.$(elementSelector);
+    // console.log("actual text is:" + element)
+    const element = await driver.$(elementSelector)
+    // const actualText = await element.getText();
+    await expect(element).toHaveText(expectedText)
 
+    //console.log("actual text is:" + actualText)
 
     // Compare the actual text with the expected text
     if (actualText == expectedText) {
       let annotationMessage = `Assertion pass. Actual text: ${actualText}, Expected text: ${expectedText}.`;
       console.log(`Assertion pass. Actual text: ${actualText}, Expected text: ${expectedText}.`);
-   //   await driver.execute(`browserstack_executor: {"action": "annotate", "arguments": {"data":"${annotationMessage}","level": "info"}}`);
+      //   await driver.execute(`browserstack_executor: {"action": "annotate", "arguments": {"data":"${annotationMessage}","level": "info"}}`);
     } else {
       let annotationMessage = `Assertion fail. Actual text: ${actualText}, Expected text: ${expectedText}.`;
       console.log(`Assertion fail. Actual text: ${actualText}, Expected text: ${expectedText}.`);
-    //  await driver.execute(`browserstack_executor: {"action": "annotate", "arguments": {"data":"${annotationMessage}","level": "info"}}`);
+      //  await driver.execute(`browserstack_executor: {"action": "annotate", "arguments": {"data":"${annotationMessage}","level": "info"}}`);
     }
   } catch (error) {
     console.error('Error occurred while verifying text:', error);

package/package.json

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

package/api/index.js

@@ -1,18 +0,0 @@
-const express = require('express')
-const app = express()
-const port = 5000
-
-let count = 0;
-
-app.get('/api', (req, res) => {
-res.json({count})
-})
-
-app.post('/api', (req, res) => {
-++count;
-res.json({count});
-});
-
-app.listen(port, () => {
-console.log(`Example app listening on port ${port}`)
-})

package/commonMethods/getdata.js

@@ -1,38 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const directory = '/Users/subhrasubudhi/WORKSPACES/WEBDRIVERIO/TEST/mobile/Testdata'; // specify your directory path
-async function getdata(filename_propertyname) {
-    try {
-        console.log('data:', filename_propertyname);
-        const parts = filename_propertyname.split(".");
-        const property = parts[1];
-        console.log('property:', property);
-        fileName = parts[0] + '.json';
-        console.log('filename:', fileName);
-
-        const files = await fs.promises.readdir(directory);
-        const file = files.find(file => file === fileName);
-
-        if (file) {
-            const filePath = path.join(directory, file);
-            const jsonData = await fs.promises.readFile(filePath, 'utf-8');
-            const parsedData = JSON.parse(jsonData);
-            console.log(parsedData);
-            const value = parsedData[property];
-            console.log(value);
-            return value;
-        } else {
-            throw new Error(`File '${_filename}' not found in directory '${directory}'.`);
-        }
-    } catch (error) {
-        console.error('Error occurred:', error);
-        throw error; // Rethrow the error for the caller to handle.
-    }
-}
-module.exports = getdata;
-// Example usage:
-// specify your file name
-
-//console.log(getdata('data1.env'));
-
-

package/commonMethods/test.js

@@ -1,19 +0,0 @@
-const fs = require("fs");
-
-function readAndParseJSON(filename) {
-    const [fileName, fileExtension] = filename.split(".");
-    const jsonFilePath = fileName + ".json";
-    const constantProperty = fileExtension;
-
-    const filePath = `/Users/subhrasubudhi/WORKSPACES/WEBDRIVERIO/TEST/mobile/Testdata/${jsonFilePath}`;
-
-    const jsonData = fs.readFileSync(filePath, "utf-8");
-    const parsedData = JSON.parse(jsonData);
-    
-    console.log(parsedData);
-    const value = parsedData[constantProperty];
-    return value;
-}
-
-const data1 = readAndParseJSON("data1.env");
-console.log(data1);