froth-webdriverio-framework 1.0.38 → 1.0.40

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 {
@@ -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 {
@@ -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 {
@@ -52,7 +52,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,13 +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 ...');
-        // Initialize variables, configure environment, etc.
-    },
-
 
     /**
      * Gets executed before the suite starts (in Mocha/Jasmine only).
@@ -40,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/web.conf.bs.js

@@ -1,24 +1,27 @@
-config = {
+const deepmerge = require('deepmerge')
+const commonconfig = require('./commonconfig');
+
+const webbsconfig = deepmerge.all([commonconfig, {
     // ====================
     // BrowserStack Configuration
     // ====================
-    user: 'prabathkumar_qavxGX',
-    key: 'RvqEi62rhwa5QwGJtweZ',
-    browserstackLocal: true, // Set to true if using BrowserStack Local Testing
+    user: process.env.BROWSERSTACK_USERNAME || 'prabathkumar_qavxGX',
+    key: Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8') || 'RvqEi62rhwa5QwGJtweZ',
+    browserstackLocal: false, // Set to true if using BrowserStack Local Testing
     opts: { forceLocal: true },
     // ====================
     // Specify Test Files
     // ====================
-   
+
     services: [
         ['browserstack', {
             testObservability: true,
             testObservabilityOptions: {
-                user: 'prabathkumar_qavxGX' || process.env.BROWSERSTACK_USERNAME,
-                key: 'RvqEi62rhwa5QwGJtweZ' || process.env.BROWSERSTACK_ACCESS_KEY,
-                projectName: 'YTL_AF',
-                buildName: 'YTL_AF_WEBDRIVERIO',
-                buildTag: 'YTL_AF_WEBDRIVERIO',
+                // user: 'prabathkumar_qavxGX' || process.env.BROWSERSTACK_USERNAME,
+                // key: 'RvqEi62rhwa5QwGJtweZ' || process.env.BROWSERSTACK_ACCESS_KEY,
+                projectName: process.env.PROJECTNAME || "roboticodigital",
+                buildName: 'WEB BUILD',
+                buildTag: 'WEB BUILD',
             },
         }]
     ],
@@ -27,8 +30,8 @@ config = {
     // ====================
     capabilities: [
         {
-            browserName: 'chrome', // Choose the browser you want to test
-            browserVersion: 'latest', // Specify the browser version
+            browserName: process.env.BROWSERSTACK_BROWSER || 'chrome', // Choose the browser you want to test
+            browserVersion: process.env.BROWSERSTACK_BROWSER_VERSION || 'latest', // Specify the browser version
             os: 'Windows', // Specify the operating system
             os_version: '10', // Specify the operating system version
             resolution: '1920x1080', // Specify the screen resolution
@@ -52,15 +55,8 @@ config = {
     // Framework
     // ====================
     framework: 'mocha', // Use the Mocha framework
-    reporters: ['spec',
-        // [
-        //     'allure',
-        //     {
-        //         outputDir: './web-report/allure-result/',
-        //         disableWebdriverStepsReporting: true,
-        //         disableWebdriverScreenshotsReporting: false,
-        //     },
-        // ],
+    reporters: ['spec'
+
     ], // Use the spec reporter
 
     // ====================
@@ -68,13 +64,14 @@ config = {
     // ====================
     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();
-        }
-    },
+    // after: function (capabilities, specs) {
+    //     // Code to run after all tests
+    //     if (error) {
+    //         browser.takeScreenshot();
+    //     }
+    // },
 
     // ====================
     // BrowserStack Options
@@ -90,6 +87,6 @@ config = {
         ui: 'bdd', // Set the test interface to BDD
         timeout: 60000, // Set the timeout for test cases in milliseconds
     },
-};
+}]);
 
-module.exports = config;
+module.exports = webbsconfig;

package/package.json

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