froth-webdriverio-framework 0.1.49 → 0.1.51

package/api/getsuiteDetails.js

@@ -4,8 +4,8 @@ const getLoginToken = require("../api/loginapi");
 // Function to get data from the API using the Bearer token
 async function getSuiteDetails(frothUrl, token, id) {
     let jsondata = {};
-    if (id != 0) {
-        const url = `https://${frothUrl}/api/automationsuite-retrieve/${id}`;
+    if (id = null || id != 0) {
+        const url = `https://${frothUrl}/api/automationsuite-retrieve/${id}/`;
 
         try {
 
@@ -13,6 +13,8 @@ async function getSuiteDetails(frothUrl, token, id) {
                 method: 'GET',
                 headers: {
                     'Authorization': `Bearer ${token}`,
+                    'Content-Type': 'application/json'
+
                 }
             });
             if (response.ok) {

package/api/readTestdata.js

@@ -4,7 +4,7 @@ const login = require('./loginapi.js');
 async function getDataById(frothUrl, token, id) {
 
     if (id != 0) {
-        const url = `https://${frothUrl}/api/testdata-retrieve/${id}`;
+        const url = `https://${frothUrl}/api/testdata-retrieve/${id}/`;
 
         try {
 
@@ -12,6 +12,7 @@ async function getDataById(frothUrl, token, id) {
                 method: 'GET',
                 headers: {
                     'Authorization': `Bearer ${token}`,
+                    'Content-Type': 'application/json'
                 }
             });
 

package/config/android.conf.js

@@ -10,7 +10,7 @@ const androidConfig = deepmerge.all([commonmobileconfig, {
         testObservability: true,
         buildName: "ANDROID BUILD 1",
         buildIdentifier: process.env.BUILD_NUMBER || "default_build_identifier",
-        browserstackLocal: true,
+        browserstackLocal: false,
         opts: { forcelocal: false },
         app: process.env.BROWSERSTACK_APP_PATH || 'bs://a224145c09eb22e67c21ef65b29d32ae7aa78bb0'
       }

package/config/commonconfig.js

@@ -13,32 +13,30 @@ const commonconfig = {
         // This code runs before the test suite starts
         // console.log("organisation url" + process.env.organisation_url);
         // console.log("test data id" + process.env.testdata_id);
-        process.env.BUFFER = null;
-        localStorage.setItem("EXECUTION_ID",process.env.EXECUTION_ID)
-        localStorage.setItem("organisation_url",process.env.organisation_url)
-        localStorage.setItem("SERVICE_USER","subhra.subudhi@roboticodigital.com")
-        localStorage.setItem("SERVICE_PASSWORD","V2VsY29tZUAxMjM=")
+        localStorage.setItem("EXECUTION_ID", process.env.EXECUTION_ID)
+        localStorage.setItem("organisation_url", process.env.organisation_url)
+        localStorage.setItem("SERVICE_USER", "subhra.subudhi@roboticodigital.com")
+        localStorage.setItem("SERVICE_PASSWORD", "V2VsY29tZUAxMjM=")
 
         const getToken = await getLoginToken(localStorage.getItem("organisation_url"), localStorage.getItem("SERVICE_USER"), localStorage.getItem("SERVICE_PASSWORD"));
         process.env.LOGIN_TOKEN = getToken;
-        localStorage.setItem("LOGIN_TOKEN",getToken)
-
-        const getExeDetails = await exeDetails.getExecutionDetails(localStorage.getItem("organisation_url"), getToken, localStorage.getItem(EXECUTION_ID));
-        const getSuiteDetail = await getSuiteDetails(localStorage.getItem("organisation_url"), getToken, getExeDetails.automation_suite_id);
-        if (getSuiteDetail.test_data_id == null)
-            console.log("Test data is not linked");
-        else {
-            const jsonobject = await getDataById(localStorage.getItem("organisation_url"), getSuiteDetail.test_data_id);
-            if (jsonobject == null) {
-                console.log("Test data is not available");
-            }
-            else {
-                process.env.BUFFER = JSON.stringify(jsonobject);
-                localStorage.setItem("BUFFER",jJSON.stringify(sonobject))
-
+        localStorage.setItem("LOGIN_TOKEN", getToken)
+
+        const getExeDetails = await exeDetails.getExecuitonDetails(localStorage.getItem("organisation_url"), getToken, localStorage.getItem("EXECUTION_ID"));
+        if (getExeDetails.automation_suite_id != null) {
+            const getSuiteDetail = await getSuiteDetails(localStorage.getItem("organisation_url"), getToken, getExeDetails.automation_suite_id);
+            if (getSuiteDetail.test_data_id != null)
+                {
+                const jsonobject = await getDataById(localStorage.getItem("organisation_url"), getSuiteDetail.test_data_id);
+                if (jsonobject == null) {
+                    console.log("Test data is not available");
+                }
+                else {
+                    localStorage.setItem("BUFFER", JSON.stringify(jsonobject))
+
+                }
             }
         }
-
     },
 
     before: function (capabilities, specs) {
@@ -156,7 +154,7 @@ function convertMillisecondsToTime(msdata) {
 //         const frothUrl = "devapi.frothtestops.com";
 //         const username = "subhra.subudhi@roboticodigital.com";
 //         const password = "V2VsY29tZUAxMjM=";
-        
+
 //         const token = await getLoginToken(frothUrl, username, password);
 //         if (!token) {
 //             throw new Error('Login failed, no token obtained');

package/config/ios.conf.js

@@ -9,7 +9,7 @@ const iosconfig = deepmerge.all([commonmobileconfig, {
         testObservability: true,
         buildName: "IOS",
         buildIdentifier: 'BUILD',
-        browserstackLocal: true,
+        browserstackLocal: false,
         opts: { 
           forcelocal: false, 
           localIdentifier: "webdriverio-appium" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "0.1.49",
+  "version": "0.1.51",
   "readme": "WendriverIO Integration with [BrowserStack]",
   "description": "WebdriverIO and BrowserStack App Automate",
   "license": "MIT",