froth-webdriverio-framework 1.0.39 → 1.0.41

package/api/getexecutionDetails.js

@@ -4,7 +4,7 @@ const getLoginToken = require("../api/loginapi.js")
 
 async function getExecuitonDetails(frothUrl, token, id) {
     let jsondata = {};
-    if (id != 0) {
+    if (id != 0 || id != null || id != undefined) {
         const url = `https://${frothUrl}/api/test-execution-retrieve/${id}`;
 
         try {
@@ -38,8 +38,8 @@ async function getExecuitonDetails(frothUrl, token, id) {
                 return getExecuitonDetails(frothUrl, newToken, id);
             } else {
                 const errorText = await response.text();
-                console.error('Data fetch failed response:', errorText);
-                throw new Error(`HTTP error! status: ${response.status}`);
+                console.error(`Data fetch failed response: ${response.status}`);
+               // throw new Error(`HTTP error! status: ${response.status}`);
             }
 
 
@@ -49,7 +49,7 @@ async function getExecuitonDetails(frothUrl, token, id) {
 
         }
     } else {
-        console.error('getExecuitonDetails Error fetching data: Invalid ID');
+        console.error('getExecuitonDetails Error fetching data: Invalid ID or not executionid is linked to the execution.');
     }
 
 }

package/api/getintegrationDetails.js

@@ -2,7 +2,7 @@
 // Function to get data from the API using the Bearer token
 async function getintegrationdetails(frothUrl, token, id) {
     let jsondata = {};
-    if ( id != 0) {
+    if (id != 0 || id != null || id != undefined) {
         const url = `https://${frothUrl}/api/intergration-view/${id}/`;
 
         try {

package/api/getsuiteDetails.js

@@ -2,7 +2,7 @@
 // Function to get data from the API using the Bearer token
 async function getSuiteDetails(frothUrl, token, id) {
     let jsondata = {};
-    if (id != 0) {
+    if (id != 0 || id != null || id != undefined) {
         const url = `https://${frothUrl}/api/automationsuite-retrieve/${id}/`;
 
         try {
@@ -34,8 +34,8 @@ async function getSuiteDetails(frothUrl, token, id) {
             }
             else {
                 const errorText = await response.text();
-                console.error('Data fetch failed response:', errorText);
-                throw new Error(`HTTP error! status: ${response.status}`);
+                console.error(`Data fetch failed response: ${response.status}`);
+              //  throw new Error(`HTTP error! status: ${response.status}`);
             }
 
 
@@ -45,7 +45,7 @@ async function getSuiteDetails(frothUrl, token, id) {
 
         }
     } else {
-        console.error('Error fetching data: Invalid ID');
+        console.error('Error fetching data: Invalid ID or no suite id is linked to execution');
     }
 
 }

package/api/readTestdata.js

@@ -5,7 +5,7 @@ const getLoginToken = require('../api/loginapi.js');
 // Function to get data from the API using the Bearer token
 async function getDataById(frothUrl, token, id) {
 
-    if (id != 0) {
+    if (id != 0 || id != null || id != undefined) {
         const url = `https://${frothUrl}/api/testdata-retrieve/${id}/`;
 
         try {
@@ -41,8 +41,9 @@ async function getDataById(frothUrl, token, id) {
             }
             else {
                 const errorText = await response.text();
-                console.error('Data fetch failed response:', errorText);
-                throw new Error(`HTTP error! status: ${response.status}`);
+                // console.error('Data fetch failed response:', errorText);
+                console.error(`Data fetch failed response: ${response.status}`);
+               // throw new Error(`HTTP error! status: ${response.status}`);
             }
 
 
@@ -52,7 +53,7 @@ async function getDataById(frothUrl, token, id) {
 
         }
     } else {
-        console.error('Error fetching data: Invalid ID');
+        console.error('Error fetching data: Invalid ID or no testdata linked to the execution.');
     }
 
 }

package/config/android.conf.js

@@ -11,23 +11,26 @@ const androidConfig = deepmerge.all([commonmobileconfig, {
       {
         testObservability: true,
         buildName: "ANDROID BUILD",
-        buildIdentifier: "ANDROID BUILD_"+process.env.BUILD_NUMBER ,
+        buildIdentifier: "ANDROID BUILD_" + process.env.BUILD_NUMBER,
         browserstackLocal: false,
         opts: { forcelocal: false },
-        app: process.env.BROWSERSTACK_APP_PATH 
+        app: process.env.BROWSERSTACK_APP_PATH
       }
     ]
   ],
 
   capabilities: [{
     'bstack:options': {
-      deviceName: process.env.DEVICENAME ,
-      platformVersion: process.env.OSVERSION ,
+      deviceName: process.env.DEVICENAME,
+      platformVersion: process.env.OSVERSION,
       platformName: 'android',
       interactiveDebugging: true
     }
   }],
-
+  before: function (capabilities, specs) {
+   // browser.maximizeWindow()
+    process.env.BS_SESSION_TYPE = "app-automate";
+  },
 
 }]);
 

package/config/commonconfig.js

@@ -23,14 +23,6 @@ const commonconfig = {
         //console.log("ALL JSON DATA in env variable :" + JSON.stringify(process.env));
     },
 
-    // before: function (capabilities, specs) {
-
-    //     // Code to run before the test suite starts
-    //     console.log('Starting test suite IN EBFORE HOOK ...');
-    //     browser.maximizeWindow();
-    //     // Initialize variables, configure environment, etc.
-    // },
-
 
     /**
      * Gets executed before the suite starts (in Mocha/Jasmine only).
@@ -41,7 +33,7 @@ const commonconfig = {
             console.log("Running suite:", suite.title);
             console.log("Reading test data from the API");
 
-            getBSSessionDetails("app-automate", process.env.BROWSERSTACK_USERNAME, Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8'));
+            getBSSessionDetails( process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8'));
 
         } catch (e) {
             console.log("Error in beforeSuite:", e);

package/config/ios.conf.js

@@ -10,9 +10,10 @@ const iosconfig = deepmerge.all([commonmobileconfig, {
         buildName: "IOS",
         buildIdentifier: 'BUILD',
         browserstackLocal: false,
-        opts: { 
-          forcelocal: false, 
-          localIdentifier: "webdriverio-appium" },
+        opts: {
+          forcelocal: false,
+          localIdentifier: "webdriverio-appium"
+        },
         app: process.env.BROWSERSTACK_APP_PATH || 'bs://d6588d0899a2ac5c485d4784af9ad28d06b98c44'
       }
     ]
@@ -22,10 +23,15 @@ const iosconfig = deepmerge.all([commonmobileconfig, {
     'bstack:options': {
       deviceName: process.env.DEVICENAME || "iPhone 15 Pro Max1",
       osVersion: process.env.OSVERSION || "17",
+      platformName: 'iOS',
       interactiveDebugging: true
     }
   }],
 
+  before: function (capabilities, specs) {
+    // browser.maximizeWindow()
+    process.env.BS_SESSION_TYPE = "app-automate";
+  },
 }]);
 
 module.exports = iosconfig;

package/config/web.conf.bs.js

@@ -64,13 +64,9 @@ const webbsconfig = deepmerge.all([commonconfig, {
     // ====================
     before: function (capabilities, specs) {
         browser.maximizeWindow()
+        process.env.BS_SESSION_TYPE="automate";
     },
-    // after: function (capabilities, specs) {
-    //     // Code to run after all tests
-    //     if (error) {
-    //         browser.takeScreenshot();
-    //     }
-    // },
+   
 
     // ====================
     // BrowserStack Options

package/package.json

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