froth-webdriverio-framework 5.0.13 → 5.0.15

package/froth_configs/commonconfig.js

@@ -9,8 +9,7 @@ const exeDetails = require("../froth_api_calls/getexecutionDetails")
 const { fail } = require("assert");
 const { error } = require('console');
 const HTMLReportGenerator = require('wdio-json-html-reporter').HTMLReportGenerator;
-global.Util = require('./globalUtilShim');
-
+global.Util=require('../froth_common_actions/Utils');
 
 //const isBrowserStackEnabled = process.env.BROWSERSTACK;
 let starttime;
@@ -35,6 +34,7 @@ const commonconfig = {
             await setAllDetails.setSuiteDetails();
             await setAllDetails.setTestDataDetails();
             console.log("on prepare:", JSON.stringify(capabilities))
+
             //  console.log("ALL JSON DATA in env variable :" + JSON.stringify(process.env));
         } catch (e) {
             console.log("====> Error in onPrepare:", e);
@@ -45,6 +45,8 @@ const commonconfig = {
 
     beforeSession: async function (config, capabilities, specs) {
         try {
+
+
             let syntaxFailed = false;
 
             console.log('==== BEFORE SESSION HOOK ====');
@@ -164,21 +166,7 @@ const commonconfig = {
             console.log('==== BEFORE HOOK FOR MOBILE ====');
         }
 
-        const Module = require('module');
-        const originalRequire = Module.prototype.require;
-
-        Module.prototype.require = function (path) {
-            // Intercept only for the Utils file
-            if (path.includes('froth_common_actions/Utils')) {
-                console.log('⚡ Overriding require for:', path);
-                return require('./globalUtilShim'); // <-- path relative to wdio.conf.js
-            }
-
-            return originalRequire.apply(this, arguments);
-        };
 
-        // Optionally also expose globally
-        global.Util = require('./globalUtilShim');
     },
 
     /**

package/froth_configs/wdio-require-patch.js

@@ -0,0 +1,47 @@
+/**
+ * wdio-require-patch.js
+ * This script patches Node's require() so that any test file requiring
+ * '../B/froth_common_actions/Utils' automatically gets the correct global Util object.
+ */
+
+const path = require('path');
+const fs = require('fs');
+const Module = require('module');
+console.log('🔧  Applying wdio-require-patch.js...');
+// --- 1️⃣ Locate the correct Utils.js dynamically ---
+const possiblePaths = [
+  // Local project structure    
+  path.resolve(__dirname, '../B/froth_common_actions/Utils.js'),
+  path.resolve(__dirname, '../node_modules/froth-webdriverio-framework/froth_common_actions/Utils.js'),
+
+  // Cloud structure (when framework is inside node_modules)
+  path.resolve(__dirname, './node_modules/froth-webdriverio-framework/froth_common_actions/Utils.js'),
+
+  // Fallback (when running inside another workspace)
+  path.resolve(process.cwd(), 'node_modules/froth-webdriverio-framework/froth_common_actions/Utils.js'),
+];
+
+const utilsPath = possiblePaths.find(p => fs.existsSync(p));
+
+if (!utilsPath) {
+  console.warn('⚠️  Could not find Utils.js in expected paths. Global.Util not set.');
+} else {
+  global.Util = require(utilsPath);
+  console.log(`✅  Global Util loaded from: ${utilsPath}`);
+}
+
+// --- 2️⃣ Patch Node's require() so that any require of Utils returns global.Util ---
+const originalRequire = Module.prototype.require;
+
+Module.prototype.require = function (request) {
+  // Catch any variation of the Utils import
+  if (
+    request.includes('froth_common_actions/Utils') ||
+    request.endsWith('/Utils') ||
+    request.endsWith('/Utils.js')
+  ) {
+    console.log(`⚡  Redirecting require('${request}') → global.Util`);
+    return global.Util;
+  }
+  return originalRequire.apply(this, arguments);
+};

package/froth_configs/wdio.common.conf.js

@@ -1,10 +1,12 @@
 const deepmerge = require('deepmerge')
+//global.Util=require('./patch_require'); // Ensure this is imported first
 const fs = require('fs');
 const yaml = require('js-yaml');
 const path = require('path');
 const commonconfig = require('./commonconfig');
 console.log('=====wdios common config===== ');
 const { JSONReporter, HTMLReportGenerator } = require('wdio-json-html-reporter');
+//require("./patch_require"); // Ensure this is imported first
 
 // Select platform at runtime
 const PLATFORM = process.env.PLATFORM || 'browserstack';
@@ -18,6 +20,8 @@ const resultdetails = {
     excution_time: null,   // Execution time in milliseconds
 };
 
+
+
 // Load YAML file
 //const capabilities = yaml.load(fs.readFileSync(path.join(path.resolve(process.cwd(), configFile)), 'utf8'));
 
@@ -140,7 +144,7 @@ exports.config = deepmerge(commonconfig,
 
         framework: 'mocha',
         reporters: ['spec',
-           [JSONReporter, { outputDir: reportDir,outputFile: `./reports/${process.env.EXECUTION_ID}/test-results-${timestamp}.json`, screenshotOption: 'OnFailure' }],
+            [JSONReporter, { outputDir: reportDir, outputFile: `./reports/${process.env.EXECUTION_ID}/test-results-${timestamp}.json`, screenshotOption: 'OnFailure' }],
         ],
 
         maxInstances: 10,

package/package.json

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

package/froth_configs/globalUtilShim.js

@@ -1,36 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const possiblePaths = [
-  path.resolve(process.cwd(), 'node_modules/froth-webdriverio-framework/froth_common_actions/Utils'),
-  path.resolve(process.cwd(), '../DEPENDENCY/node_modules/froth-webdriverio-framework/froth_common_actions/Utils'),
-  path.resolve(process.cwd(), '../../DEPENDENCY/node_modules/froth-webdriverio-framework/froth_common_actions/Utils'),
-];
-let loaded = false;
-
-
-for (const filePath of possiblePaths) {
-  if (fs.existsSync(filePath + '.js')) {
-    global.Util = require(filePath);
-    console.log(`✅ Global Util loaded from: ${filePath}`);
-    loaded = true;
-    break;
-  }
-}
-
-if (!loaded) {
-  try {
-    // fallback to node_modules package (cloud CI)
-    global.Util = require('froth-webdriverio-framework/froth_common_actions/Utils');
-    console.log('✅ Global Util loaded from npm package');
-    loaded = true;
-  } catch (err) {
-    console.error('❌ Could not load froth_common_actions/Utils from known paths or npm package');
-    throw err;
-  }
-}else
-  console.log('✅ Global Util already defined');
-
-console.log("global Util loaded from:", global.Util);
-
-module.exports = global.Util;