froth-webdriverio-framework 3.0.113 → 3.0.114

package/.github/workflows/main.yml

@@ -0,0 +1,23 @@
+name: npm_package
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '12.x'
+          registry-url: https://registry.npmjs.org
+      
+      - name: Publish to npm
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
+

package/{froth_api_calls → api}/browsersatckSessionInfo.js

@@ -5,13 +5,12 @@ async function getBSBuildDetails(sessiontype, bs_username, bs_pwd) {
         console.log("sessiontype:" + sessiontype)
         const username = bs_username;
         const accessKey = bs_pwd;
-        console.log("accessKey:" + accessKey)
         const basicAuth = btoa(`${username}:${accessKey}`);
 
         let hashed_id = null;
 
         // const sessionid= BUFFER.getItem("SESSION_ID");
-        console.log("Browsersatck build name :" + process.env.BROWSERSTACK_BUILD_NAME)
+
         const url = `https://api.browserstack.com/${sessiontype}/builds.json?name=${process.env.BROWSERSTACK_BUILD_NAME}`;
 
         console.log("url:" + url)
@@ -36,7 +35,6 @@ async function getBSBuildDetails(sessiontype, bs_username, bs_pwd) {
         } 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}`);
         }
 
@@ -54,9 +52,7 @@ async function getBSSessionDetails(sessiontype, bs_username, bs_pwd) {
     try {
         // const sessionId = sessionIdd;    
         const username = bs_username;
-        //  const accessKey = Buffer.from(bs_pwd, 'base64').toString('utf-8');
-        const accessKey = bs_pwd;
-
+        const accessKey = Buffer.from(bs_pwd, 'base64').toString('utf-8');
         const basicAuth = btoa(`${username}:${accessKey}`);
 
         const hash_id = await getBSBuildDetails(sessiontype, bs_username, accessKey)
@@ -81,7 +77,7 @@ async function getBSSessionDetails(sessiontype, bs_username, bs_pwd) {
             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")
@@ -106,7 +102,7 @@ async function amend2Browserstack(annotationMessage, level) {
     try {
 
         console.log("Annotation message inside amend2Browserstack:" + annotationMessage)
-        if (process.env.PLATFORM === 'browserstack') 
+        if (process.env.BROWSERSTACK)
             await driver.execute('browserstack_executor: {"action": "annotate", "arguments": {"data":"' + annotationMessage + '","level": "' + level + '"}}');
 
     } catch (error) {

package/{froth_api_calls → api}/getexecutionDetails.js

@@ -1,5 +1,5 @@
 
-//const getLoginToken = require("./loginapi.js")
+const getLoginToken = require("../api/loginapi.js")
 // Function to get data from the API using the Bearer token
 
 async function getExecuitonDetails(frothUrl, token, id) {
@@ -21,24 +21,20 @@ async function getExecuitonDetails(frothUrl, token, id) {
             if (response.ok) {
                 const data = await response.json();
                 //  console.log(data)
-                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("in get execution details json data :" + JSON.stringify(jsondata));
+                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
+                }
+                // console.log("json data :" + JSON.stringify(jsondata));
 
                 return jsondata;
             } else if (response.status === 401) { // Unauthorized, token expired
                 // 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
+                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 getExecuitonDetails(frothUrl, newToken, id);
-              console.log("Unauthorized, token expired"+response.status)
+                return getExecuitonDetails(frothUrl, newToken, id);
             } else {
                 const errorText = await response.text();
                 console.error(`Data fetch failed response in getExecuitonDetails: ${response.status}`);
@@ -57,7 +53,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}`;
 
@@ -81,12 +77,10 @@ async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_i
 
             return id;
         } else if (response.status === 401) { // Unauthorized, token expired
-            console.log("Unauthorized, token expired"+response.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
+            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 getExecuitonScriptDetails(frothUrl, newToken, execution_id, script_id);
+            return getExecuitonScriptDetails(frothUrl, newToken, execution_id, script_id);
         } else {
             const errorText = await response.text();
             console.error(`Data fetch failed response in getExecuitonScriptDetails: ${response.status}`);
@@ -103,7 +97,7 @@ async function getExecuitonScriptDetails(frothUrl, token, execution_id, script_i
 }
 
 async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
-   // if (id != 0) {
+    if (id != 0) {
 
 
         const url = `${frothUrl}/api/test-execution-update/${id}/`;
@@ -119,11 +113,9 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
             }
             formData.append('id', BUFFER.getItem("FROTH_EXECUTION_ID"))
             formData.append('report_url', BUFFER.getItem("REPORT_URL"))
-            formData.append('updated_through_bot', true)
+            formData.append('comments', JSON.stringify(resultdetails.comments))
 
             console.log("Report URL:" + BUFFER.getItem("REPORT_URL"))
-            
-
 
             const response = await fetch(url, {
                 method: 'PUT',
@@ -140,11 +132,9 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
 
             } else if (response.status === 401) { // Unauthorized, token expired
                 // 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 updateExecuitonDetails(frothUrl, newToken, id, resultdetails);
-                console.log("Unauthorized, token expired"+response.status)
-
+                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 updateExecuitonDetails(frothUrl, newToken, id, resultdetails);
             } else {
                 const errorText = await response.text();
                 console.error(`error in updating the status into DB  ${response.status}`);
@@ -157,18 +147,18 @@ async function updateExecuitonDetails(frothUrl, token, id, resultdetails) {
             console.error('Error fetching data:', error);
 
         }
-    // } else {
-    //     console.error('Error fetching data: Invalid ID');
-    // }
+    } else {
+        console.error('Error fetching data: Invalid ID');
+    }
 
 }
 
-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();
@@ -176,7 +166,6 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_pla
             console.log("URL" + url)
             // formData.append('execution_id', BUFFER.getItem("EXECUTION_ID"))
             formData.append('script_status', status)
-            formData.append('updated_through_bot', true)
 
             const response = await fetch(url, {
                 method: 'PUT',
@@ -193,11 +182,9 @@ async function updateScriptExecutionStatus(frothUrl, token, scriptid, script_pla
 
             } else if (response.status === 401) { // Unauthorized, token expired
                 // 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);
-                console.log("Unauthorized, token expired"+response.status)
-
+                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);
             } else {
                 const errorText = await response.text();
                 console.error(`error in updating the status into DB  ${response.status}`);

package/{froth_api_calls → api}/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,38 +18,37 @@ 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.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))
                 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;
 
             } else if (response.status === 401) { // Unauthorized, token expired
                 // 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 getSuiteDetails(frothUrl, newToken, id);
-                console.log("Unauthorized, token expired" + response.status)
+                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 getSuiteDetails(frothUrl, newToken, 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/{froth_api_calls → api}/loginapi.js

@@ -8,8 +8,10 @@ async function getLoginToken(frothUrl, email, password) {
         console.log("URL: " + url);
         const formData = new FormData();
         formData.append('email_or_username', email);
-        formData.append('password', await enc(password,"froth-testops@rd"));
-        formData.append('is_ad_user', false)
+        //formData.append('password', await enc(password,"froth-testops@rd"));
+        formData.append('password', password);
+        formData.append('is_ad_user', false);
+        formData.append('remember_me', false);
 
         const response = await fetch(url, {
             method: 'POST',

package/{froth_api_calls → api}/readTestdata.js

@@ -1,5 +1,5 @@
 
-const getLoginToken = require('./loginapi.js');
+const getLoginToken = require('../api/loginapi.js');
 
 
 // Function to get data from the API using the Bearer token
@@ -35,11 +35,9 @@ async function getDataById(frothUrl, token, id) {
             }
             else if (response.status === 401) { // Unauthorized, token expired
                 // 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 getDataById(frothUrl, newToken, id);
-                console.log("Unauthorized, token expired" + response.status)
-
+                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 getDataById(frothUrl, newToken, id);
             }
             else {
                 const errorText = await response.text();

package/{froth_common_actions → commonMethods}/Utils.js

@@ -7,17 +7,14 @@ let scrollToLeft = null;
 let scrollToRight = null;
 let scrollDownToView = null;
 let scrollRightToView = null;
-let scrollUpUntilVisible = null;
 
 let swipeRight = null;
 let swipeLeft = null;
 let swipeUp = null;
 let swipeDown = null;
-let swipetoFit = null;
-let swipeWithCoordinates = null;
+
 
 let clickIfVisible = null;
-let doubleClick = null;
 
 let assertText = null;
 let randomtext = null;
@@ -38,15 +35,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') {
+if (process.env.LOCATION == 'local') {
     basepath = ".";
 } else {
-    basepath = "froth-webdriverio-framework/froth_common_actions";
+    basepath = "froth-webdriverio-framework/commonMethods";
 }
 
 scrollToEnd = require(basepath + "/scroll").scrollToEnd;
@@ -56,19 +53,14 @@ scrollToRight = require(basepath + '/scroll').scrollToRight;
 scrollDownToView = require(basepath + '/scroll').scrollDownToView;
 scrollRightToView = require(basepath + '/scroll').scrollRightToView;
 scrollIntoView = require(basepath + '/scroll').scrollIntoView;
-scrollUpUntilVisible = require(basepath + '/scroll').scrollupUntilVisible;
-
 
 swipeDown = require(basepath + '/swipe').swipedown;
 swipeLeft = require(basepath + '/swipe').swipeleft;
 swipeRight = require(basepath + '/swipe').swiperight;
 swipeUp = require(basepath + '/swipe').swipeup;
-swipetoFit= require(basepath + '/swipe').swipetofit;
-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;
@@ -90,8 +82,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;
 
@@ -105,7 +97,6 @@ module.exports = {
     scrollRightToView,
     clickIfVisible,
     clickByIdWithExecute,
-    doubleClick,
     assertText,
     assertAttributeValue,
     randomtext,
@@ -119,17 +110,14 @@ module.exports = {
     storevalue,
     storeattributevalue,
     scrollIntoView,
-    scrollUpUntilVisible,
     api,
     validate,
     selectDropDownValue,
-    acceptAlert,
-    dismissAlert,
+    acceptalert,
+    dismissalert,
     swipeLeft,
     swipeRight,
     swipeDown,
     swipeUp,
-    swipetoFit,
-    swipeWithCoordinates,
     generateJWT
 };

package/{froth_common_actions → commonMethods}/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 → commonMethods}/apicall.js

@@ -1,4 +1,4 @@
-const amendToBrowserstack = require("../froth_api_calls/browsersatckSessionInfo").amend2Browserstack;
+const amendToBrowserstack = require("../api/browsersatckSessionInfo").amend2Browserstack;
 
 async function callapi(method, api_url, queryParams, payloaddetails, authentication, headers, attachments) {
     let response;
@@ -88,14 +88,8 @@ 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);
@@ -115,25 +109,19 @@ 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(`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}.`;
+        console.log("verification succeeded.");
+        let annotationMessage = `${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 : ${attribute_name} verification failed. Expected text: ${valueToVerify}. error: ${e.message}`);
-        let annotationMessage = `Attribute name : ${attribute_name} - verification failed. Expected text: ${valueToVerify}. error: ${e.message}`;
+        console.log(`${attribute_name} verification failed. Expected text: ${valueToVerify}.`);
+        let annotationMessage = `${attribute_name} - verification failed. Expected text: ${valueToVerify}.`;
         await amendToBrowserstack(annotationMessage, "error");
 
         throw e;

package/{froth_common_actions → commonMethods}/click.js

@@ -20,29 +20,6 @@ async function clickIfVisible(elementSelector) {
   }
 }
 
-async function doubleclick(elementSelector) {
-  try {
-    let isDisplayed;
-    // Wait for the element to be visible
-    await driver.waitUntil(async () => {
-      console.log("Waiting for element to be visible");
-      const element = await $(elementSelector);
-      isDisplayed = await element.isDisplayed();
-      console.log("Element is displayed:", isDisplayed);
-      if (isDisplayed) {
-        // Get the actual text from the element
-        const element = await $(elementSelector);
-        await element.doubleClick();
-        console.log("Element is double clicked successfully.");
-        return;
-      }
-    }, { timeout: 30000 });
-  } catch (error) {
-    console.error("Element not found or not visible within 30 seconds");
-  }
-}
-
-
 
 async function clickByIdWithExecute(elementid) {
   try {
@@ -54,4 +31,4 @@ async function clickByIdWithExecute(elementid) {
   }
 }
 
-module.exports = { clickIfVisible, clickByIdWithExecute ,doubleclick};
+module.exports = { clickIfVisible, clickByIdWithExecute };

package/{froth_common_actions → commonMethods}/jwt.js

@@ -54,7 +54,7 @@ function main() {
         iat: currentTimestamp, // Issued at
         exp: currentTimestamp + 200, // Expiry time: 30 seconds from issuance
         user_agent: {
-            id: "kartikaypriya.p@ytlcomms.my"
+            id: "janga.reddy@ytlcomms.my"
         }
     };
 

package/{froth_common_actions → commonMethods}/scroll.js

@@ -79,26 +79,4 @@ async function scrollIntoView(element){
         console.error(error.message);
     }
 }
-
-async function scrollupUntilVisible(selector) {
-    const element = await $(selector);
-
-    while (!(await element.isDisplayed())) {
-        await driver.performActions([
-            {
-                type: 'pointer',
-                id: 'finger1',
-                parameters: { pointerType: 'touch' },
-                actions: [
-                    { type: 'pointerMove', duration: 0, x: 200, y: 800 },
-                    { type: 'pointerDown', button: 0 },
-                    { type: 'pause', duration: 100 },
-                    { type: 'pointerMove', duration: 500, x: 200, y: 200 },
-                    { type: 'pointerUp', button: 0 }
-                ]
-            }
-        ]);
-        await browser.pause(500);
-    }
-}
-module.exports = { scrollToEnd, scrollToLeft, scrollToBeginning, scrollRightToView, scrollDownToView, scrollToRight ,scrollIntoView,scrollupUntilVisible};
+module.exports = { scrollToEnd, scrollToLeft, scrollToBeginning, scrollRightToView, scrollDownToView, scrollToRight ,scrollIntoView};

package/commonMethods/swipe.js

@@ -0,0 +1,59 @@
+async function swipeleft(selector, xoffset, speedinsec) {
+    try {
+        console.log('Swiping left');
+
+        if (xoffset == null) {
+            driver.swipeLeft(selector, speedinsec);
+        } else {
+            driver.swipeLeft(selector, xoffset, speedinsec);
+        }
+    } catch (error) {
+        console.error(error.message);
+    }
+
+}
+
+async function swiperight(selector, xoffset, speedinsec) {
+    try {
+        console.log('Swiping right');
+
+        if (xoffset == null) {
+            driver.swipeRight(selector, speedinsec);
+        } else {
+            driver.swipeRight(selector, xoffset, speedinsec);
+        }
+    } catch (error) {
+        console.error(error.message);
+    }
+
+}
+
+async function swipeup(selector, yoffset, speedinsec) {
+    try {
+        console.log('Swiping up');
+
+        if (yoffset == null) {
+            driver.swipeUp(selector, speedinsec);
+        } else {
+            driver.swipeUp(selector, yoffset, speedinsec);
+        }
+    } catch (error) {
+        console.error(error.message);
+    }
+}
+
+async function swipedown(selector, yoffset, speedinsec) {
+    try {
+        console.log('Swiping down');
+
+        if (yoffset == null) {
+            driver.swipeDown(selector, speedinsec);
+        } else {
+            driver.swipeDown(selector, yoffset, speedinsec);
+        }
+    } catch (error) {
+        console.error(error.message);
+    }
+}
+
+module.exports = { swipeleft, swipedown, swiperight, swipeup };