froth-webdriverio-framework 2.0.42 → 2.0.44

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,47 +1,44 @@
 const deepmerge = require('deepmerge')
 const commonconfig = require('./commonconfig');
-
-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'),
-
-    logLevel: 'info',
-    coloredLogs: true,
-    screenshotPath: './errorShots/',
-    baseUrl: '',
-    waitforTimeout: 90000,
-    connectionRetryTimeout: 90000,
-    connectionRetryCount: 2,
-
-    framework: 'mocha',
-    mochaOpts: {
-        ui: 'bdd',
-        timeout: 90000
+const isBrowserStackEnabled = process.env.BROWSERSTACK;
+console.log("isBrowserStackEnabled", isBrowserStackEnabled);
+
+const browserStackConfig = isBrowserStackEnabled === true ? {
+    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
+        }
+    }
+} : {};
+
+const commonmobconfig = deepmerge.all([
+    commonconfig,
+    {
+        logLevel: 'info',
+        coloredLogs: true,
+        screenshotPath: './errorShots/',
+        baseUrl: '',
+        waitforTimeout: 90000,
+        connectionRetryTimeout: 90000,
+        connectionRetryCount: 2,
+
+        framework: 'mocha',
+        mochaOpts: {
+            ui: 'bdd',
+            timeout: 90000
+        },
+
+        maxInstances: 10,
+
+        updateJob: false,
+        reporters: ['spec'],
     },
-
-    maxInstances: 10,
-
-    updateJob: false,
-    reporters: [
-        'spec'
-    ],
-    // commonCapabilities: {
-    //     'bstack:options': {
-    //         projectName: process.env.PROJECTNAME || "roboticodigital",
-    //        // buildName: "Automation Build",
-    //         sessionName: 'Automation test session',
-    //         debug: true,
-    //         networkLogs: true
-    //     }
-    // },
-
-
-}]);
+    browserStackConfig  // Add BrowserStack config conditionally
+]);
 
 module.exports = commonmobconfig;

package/config/commonconfig.js

@@ -4,7 +4,9 @@ global.BUFFER = new LocalStorage('./storage');
 const path = require('path');
 const exeDetails = require("../api/getexecutionDetails")
 const getBSSessionDetails = require("../api/browsersatckSessionInfo")
-
+const isBrowserStackEnabled = process.env.BROWSERSTACK;
+let starttime;
+let endtime;
 
 // Description: This file contains the common configuration for the webdriverio framework.
 const commonconfig = {
@@ -31,9 +33,10 @@ const commonconfig = {
     beforeSuite: async function (suite) {
         try {
             console.log("Running suite:", suite.title);
+            starttime = new Date().getTime();
             //  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 +81,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 +95,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)
 
     },
     /**
@@ -123,13 +126,18 @@ const commonconfig = {
     },
 
     afterSession: async function (config, capabilities, specs) {
-
         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);
+        // Perform any cleanup or post-test actions here
+        
+        endtime = new Date().getTime();
+        let totalDuration = endtime - starttime;
+        console.log("Total Duration:" + totalDuration);
+        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"));
+        console.log("Total Duration:" + BUFFER.getItem("FROTH_TOTAL_DURATION") === 0 ? totalDuration:BUFFER.getItem("FROTH_TOTAL_DURATION"));
         resultdetails.excution_time = await secondsToTime(BUFFER.getItem("FROTH_TOTAL_DURATION"))
         await exeDetails.updateExecuitonDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("FROTH_EXECUTION_ID"), resultdetails)
         BUFFER.clear();

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.44",
   "readme": "WebdriverIO Integration",
   "description": "WebdriverIO and BrowserStack App Automate",
   "license": "MIT",