froth-webdriverio-framework 2.0.42 → 2.0.43

package/api/browsersatckSessionInfo.js

@@ -75,7 +75,7 @@ async function getBSSessionDetails(sessiontype, bs_username, bs_pwd) {
             const publicUrl = data[0].automation_session.public_url;
             const duration = data[0].automation_session.duration;
             BUFFER.setItem("REPORT_URL", publicUrl)
-            BUFFER.setItem("TOTAL_DURATION", duration)
+            BUFFER.setItem("FROTH_TOTAL_DURATION", duration)
 
             //return jsondata;
         } else if (response.status === 401) { // 

package/config/android.conf.js

@@ -1,5 +1,7 @@
 const deepmerge = require('deepmerge')
 const commonmobileconfig = require('./common.mobile.conf');
+process.env.BROWSERSTACK = true;
+
 const androidConfig = deepmerge.all([commonmobileconfig, {
   services: [
     [

package/config/api.conf.bs.js

@@ -1,5 +1,6 @@
 const deepmerge = require('deepmerge')
 const commonmobileconfig = require('./common.mobile.conf');
+
 const apiconfig = deepmerge.all([commonmobileconfig, {
 
 

package/config/api.conf.js

@@ -1,5 +1,7 @@
 const deepmerge = require('deepmerge')
 const commonmobileconfig = require('./common.mobile.conf');
+process.env.BROWSERSTACK = false;
+
 const apiconfig = deepmerge.all([commonmobileconfig, {
   
   // ====================
@@ -14,7 +16,7 @@ const apiconfig = deepmerge.all([commonmobileconfig, {
 
   before: function (capabilities, specs) {
     // browser.maximizeWindow()
-    process.env.BS_SESSION_TYPE = "app-automate";
+    //process.env.BS_SESSION_TYPE = "app-automate";
   },
   
 

package/config/common.mobile.conf.js

@@ -1,16 +1,24 @@
 const deepmerge = require('deepmerge')
 const commonconfig = require('./commonconfig');
+const isBrowserStackEnabled = process.env.BROWSERSTACK;
 
 const commonmobconfig = deepmerge.all([commonconfig, {
 
-    ...(process.env.BROWSERSTACK_USERNAME && { user: process.env.BROWSERSTACK_USERNAME }),
-    ...(process.env.BROWSERSTACK_ACCESS_KEY && { 
-        key: Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8')
-    }),
-
+    
     // user: process.env.BROWSERSTACK_USERNAME,
     // key: Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8'),
-
+    ...(isBrowserStackEnabled && {
+        user: process.env.BROWSERSTACK_USERNAME,
+        key: Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8'),
+        commonCapabilities: {
+            'bstack:options': {
+                projectName: process.env.PROJECTNAME || "roboticodigital",
+                sessionName: 'Automation test session',
+                debug: true,
+                networkLogs: true
+            }
+        }
+    }),
     logLevel: 'info',
     coloredLogs: true,
     screenshotPath: './errorShots/',

package/config/commonconfig.js

@@ -4,6 +4,7 @@ global.BUFFER = new LocalStorage('./storage');
 const path = require('path');
 const exeDetails = require("../api/getexecutionDetails")
 const getBSSessionDetails = require("../api/browsersatckSessionInfo")
+const isBrowserStackEnabled = process.env.BROWSERSTACK;
 
 
 // Description: This file contains the common configuration for the webdriverio framework.
@@ -33,7 +34,7 @@ const commonconfig = {
             console.log("Running suite:", suite.title);
             //  const sessionId = browser.sessionId;
             //  BUFFER.setItem("SESSION_ID", sessionId)
-            if (process.env.BS_SESSION_TYPE && process.env.BROWSERSTACK_USERNAME && process.env.BROWSERSTACK_ACCESS_KEY) {
+            if (isBrowserStackEnabled) {
                 await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, process.env.BROWSERSTACK_ACCESS_KEY);
             }
             const resultdetails = {};
@@ -78,7 +79,7 @@ const commonconfig = {
         // BUFFER.setItem("FROTH_TOTAL_DURATION", Number(BUFFER.getItem("FROTH_TOTAL_DURATION")) + duration)
         console.log(`Duration: ${duration}ms`);
         console.log(`Passed: ${passed}`);
-        let scriptresult="NOT RUN";
+        let scriptresult = "NOT RUN";
         let scriptid = BUFFER.getItem(fileName.replace(".js", ""))
 
         if (passed) {
@@ -92,7 +93,7 @@ const commonconfig = {
             scriptresult = "FAILED"
         }
         console.log('---------------------------------------');
-        await exeDetails.updateScriptExecutionStatus(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"),  scriptid,scriptresult)
+        await exeDetails.updateScriptExecutionStatus(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), scriptid, scriptresult)
 
     },
     /**
@@ -126,7 +127,9 @@ const commonconfig = {
 
         console.log('This is the aftersession hook');
         //   await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8'));
-        await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, process.env.BROWSERSTACK_ACCESS_KEY);
+        if (isBrowserStackEnabled)
+            await getBSSessionDetails(process.env.BS_SESSION_TYPE, process.env.BROWSERSTACK_USERNAME, process.env.BROWSERSTACK_ACCESS_KEY);
+       
         const resultdetails = {}
         resultdetails.excution_status = BUFFER.getItem("RESULT_DATA") == 0 ? 'PASSED' : 'FAILED'
         console.log("Total Duration:" + BUFFER.getItem("FROTH_TOTAL_DURATION"));

package/config/ios.conf.js

@@ -1,6 +1,8 @@
 // This is the configuration file for iOS devices
 const deepmerge = require('deepmerge')
 const commonmobileconfig = require('./common.mobile.conf');
+process.env.BROWSERSTACK = true;
+
 const iosconfig = deepmerge.all([commonmobileconfig, {
   services: [
     [

package/config/web.conf.bs.js

@@ -1,5 +1,7 @@
 const deepmerge = require('deepmerge')
 const commonmobileconfig = require('./common.mobile.conf');
+process.env.BROWSERSTACK = true;
+
 const webbsconfig = deepmerge.all([commonmobileconfig, {
 
 

package/package.json

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