froth-webdriverio-framework 2.0.43 → 2.0.45

package/config/common.mobile.conf.js

@@ -1,55 +1,44 @@
 const deepmerge = require('deepmerge')
 const commonconfig = require('./commonconfig');
 const isBrowserStackEnabled = process.env.BROWSERSTACK;
-
-const commonmobconfig = deepmerge.all([commonconfig, {
-
-    
-    // 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
-            }
+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
         }
-    }),
-    logLevel: 'info',
-    coloredLogs: true,
-    screenshotPath: './errorShots/',
-    baseUrl: '',
-    waitforTimeout: 90000,
-    connectionRetryTimeout: 90000,
-    connectionRetryCount: 2,
-
-    framework: 'mocha',
-    mochaOpts: {
-        ui: 'bdd',
-        timeout: 90000
+    }
+} : {};
+
+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

@@ -5,7 +5,8 @@ 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 = {
@@ -32,6 +33,7 @@ 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 (isBrowserStackEnabled) {
@@ -124,16 +126,19 @@ 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'));
+        // 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"));
-        resultdetails.excution_time = await secondsToTime(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")=== 0 ? totalDuration: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();
         // Perform any cleanup or post-test actions here
@@ -150,7 +155,7 @@ async function secondsToTime(secs) {
     if (hours < 10) hours = '0' + hours;
     if (minutes < 10) minutes = '0' + minutes;
     if (seconds < 10) seconds = '0' + seconds;
-
+    console.log("Time:" + hours + ':' + minutes + ':' + seconds);
     return hours + ':' + minutes + ':' + seconds;
 }
 

package/package.json

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