froth-webdriverio-framework 7.0.84 → 7.0.85

package/froth_configs/commonhook.js

@@ -130,10 +130,10 @@ const commonHooks = {
 
     await safeUpdateExecution();
   },
-  /* ========== ON ERROR ========== */
 
 
   /* ========== BEFORE SESSION ========== */
+
   beforeSession: async function (config, capabilities, specs) {
     console.log('==== BEFORE SESSION ====');
     try {
@@ -157,7 +157,65 @@ const commonHooks = {
       }
       /** 2️⃣ BrowserStack capability normalization */
 
-      await getBrowserStackCapabilities(capabilities)
+      if (process.env.PLATFORM === 'browserstack' || process.env.PLATFORM === 'browserstacklocal') {
+        /** 🔍 Print raw capabilities first */
+        console.log('🟡 Raw Capabilities (Before):');
+        console.log(JSON.stringify(capabilities, null, 2));
+        const bsOpts = capabilities['bstack:options'] || {};
+        /** 🔍 Print existing BS options */
+        console.log('🟢 Existing bstack:options (Before Modification):');
+        console.log(JSON.stringify(bsOpts, null, 2));
+
+        if (process.env.BS_SESSION_TYPE === 'app-automate') {
+          const appPath = process.env.BROWSERSTACK_APP_PATH;
+          if (!appPath) {
+            await failExecution('BROWSERSTACK_APP_PATH is missing');
+          }
+
+          bsOpts.app = appPath;
+          capabilities['appium:app'] = appPath;
+          console.log('✅ App & media set in before session');
+
+        }
+        // Ensure bstack:options exists
+        if (!capabilities['bstack:options']) {
+          capabilities['bstack:options'] = {};
+        }
+
+        const bstackOptions = capabilities['bstack:options'];
+
+        // Example: list of media IDs you want to inject
+        // Replace <MEDIA_ID_1>, <MEDIA_ID_2> with your actual BrowserStack media IDs
+        const mediaFiles = [
+          'media://8440f686585de9b46e1c966ce764703836f918bc',
+          'media://2952ee7b9b7f0751624b0d4208d7c00b56d4e49b',
+          // Add more if needed
+        ];
+
+        // Inject media into capabilities
+        bstackOptions.uploadMedia = mediaFiles;
+
+        console.log('Injected BrowserStack media before session:', bstackOptions.uploadMedia);
+
+        // Always return capabilities (optional in WDIO, but safe)
+        return capabilities;
+        /** Media upload */
+        /** 📦 Media upload (from DB → ENV → capabilities) */
+        // if (process.env.MEDIA_FILES) {
+        //   try {
+        //     const mediaList = JSON.parse(process.env.MEDIA_FILES);
+        //     console.log("media files are", mediaList)
+        //     if (Array.isArray(mediaList) && mediaList.length > 0) {
+        //       bsOpts.uploadMedia = mediaList;
+        //       console.log('✅ uploadMedia injected:', mediaList);
+        //     }
+        //   } catch (err) {
+        //     console.warn('⚠️ MEDIA_FILES is not valid JSON', err);
+        //   }
+        // }
+        // capabilities['bstack:options'] = bsOpts;
+
+      }
       console.log('🔎 Final capabilities:', JSON.stringify(capabilities, null, 2));
 
       // console.log("config details " + JSON.stringify(config))
@@ -168,76 +226,6 @@ const commonHooks = {
       console.error('🚨 Error in beforeSession:', error.message);
     }
   },
-  // beforeSession: async function (config, capabilities, specs) {
-  //   console.log('==== BEFORE SESSION ====');
-  //   try {
-  //     /** 1️⃣ Validate test syntax */
-  //     let syntaxFailed = false;
-
-  //     for (const fileUrl of specs) {
-  //       const filePath = url.fileURLToPath(fileUrl);
-  //       try {
-  //         new Function(fs.readFileSync(filePath, 'utf8'));
-  //       } catch (err) {
-  //         const msg = `❌ Syntax error in ${path.basename(filePath)}: ${err.message}`;
-  //         console.error(msg);
-  //         resultdetails.comments.push(msg);
-  //         syntaxFailed = true;
-  //       }
-  //     }
-
-  //     if (syntaxFailed) {
-  //       await failExecution('Syntax validation failed');
-  //     }
-  //     /** 2️⃣ BrowserStack capability normalization */
-
-  //     if (process.env.PLATFORM === 'browserstack' || process.env.PLATFORM === 'browserstacklocal') {
-  //       /** 🔍 Print raw capabilities first */
-  //       console.log('🟡 Raw Capabilities (Before):');
-  //       console.log(JSON.stringify(capabilities, null, 2));
-  //       const bsOpts = capabilities['bstack:options'] || {};
-  //       /** 🔍 Print existing BS options */
-  //       console.log('🟢 Existing bstack:options (Before Modification):');
-  //       console.log(JSON.stringify(bsOpts, null, 2));
-
-  //       if (process.env.BS_SESSION_TYPE === 'app-automate') {
-  //         const appPath = process.env.BROWSERSTACK_APP_PATH;
-  //         if (!appPath) {
-  //           await failExecution('BROWSERSTACK_APP_PATH is missing');
-  //         }
-
-  //         bsOpts.app = appPath;
-  //         capabilities['appium:app'] = appPath;
-  //         console.log('✅ App & media set in before session');
-
-  //       }
-  //       /** Media upload */
-  //       /** 📦 Media upload (from DB → ENV → capabilities) */
-  //       if (process.env.MEDIA_FILES) {
-  //         try {
-  //           const mediaList = JSON.parse(process.env.MEDIA_FILES);
-  //           console.log("media files are", mediaList)
-  //           if (Array.isArray(mediaList) && mediaList.length > 0) {
-  //             bsOpts.uploadMedia = mediaList;
-  //             console.log('✅ uploadMedia injected:', mediaList);
-  //           }
-  //         } catch (err) {
-  //           console.warn('⚠️ MEDIA_FILES is not valid JSON', err);
-  //         }
-  //       }
-  //       capabilities['bstack:options'] = bsOpts;
-
-  //     }
-  //     console.log('🔎 Final capabilities:', JSON.stringify(capabilities, null, 2));
-
-  //     // console.log("config details " + JSON.stringify(config))
-
-
-  //   } catch (error) {
-  //     console.error('🚨 Error in beforeSession:', error);
-  //     console.error('🚨 Error in beforeSession:', error.message);
-  //   }
-  // },
   /* ========== BEFORE SUITE ========== */
   beforeSuite: async (suite) => {
     console.log(`==== BEFORE SUITE: ${suite.title} ====`);
@@ -405,5 +393,4 @@ async function normalizeWdioError(error) {
 }
 
 
-
 module.exports = commonHooks;

package/froth_configs/wdio.common.conf.js

@@ -21,7 +21,6 @@ try {
   process.env.BROWSERSTACK_USERNAME = bsCaps.userName
   process.env.BROWSERSTACK_ACCESS_KEY = Buffer.from(bsCaps.accessKey, 'base64').toString('utf-8')
   // Merge chrome-specific options if applicable
-  //await setAllDetails.setExecutionDetails()
 
 } catch (e) {
   console.error('❌ Failed to load capability YAML:', err.message);
@@ -47,117 +46,22 @@ console.log('====> PLATFORM NAME   :', platformName);
 console.log('====> BS SESSION TYPE :', process.env.BS_SESSION_TYPE);
 
 
+
 // --------------------
-// Load environment-specific config
+// Load env-specific config
 // --------------------
-let envConfigFn;
 if (PLATFORM === 'browserstack' || PLATFORM === 'browserstacklocal') {
-  envConfigFn = OS === 'web'
-    ? require('./browserstack/web.config')
-    : require('./browserstack/mobile.config');
+  envConfig =
+    OS === 'web'
+      ? require('./browserstack/web.config')
+      : require('./browserstack/mobile.config');
 } else {
-  envConfigFn = OS === 'web'
-    ? require('./local/web.config')
-    : require('./local/mobile.config');
-}
-
-// --------------------
-// Function to inject BrowserStack media files into capabilities
-// --------------------
-function getBrowserStackCapabilities(baseCaps) {
-  if (!baseCaps) return baseCaps;
-
-  const isArray = Array.isArray(baseCaps);
-  const capsArray = isArray ? baseCaps : [baseCaps];
-
-  const updatedCaps = capsArray.map((capability) => {
-    capability['bstack:options'] = capability['bstack:options'] || {};
-    const bsOpts = capability['bstack:options'];
-
-    
-
-    // ✅ Inject media from ENV variable
-    const bsMediaEnv = process.env.MEDIA_FILES;
-    if (bsMediaEnv) {
-      try {
-        const mediaFiles = JSON.parse(bsMediaEnv);
-        if (Array.isArray(mediaFiles)) {
-          bsOpts.uploadMedia = mediaFiles;
-          console.log('🟢 Uploading media files from ENV:', bsOpts.uploadMedia);
-        }
-      } catch (err) {
-        console.error('❌ Failed to parse BS_UPLOAD_MEDIA env variable:', err.message);
-      }
-    }
-
-    capability['bstack:options'] = bsOpts;
-    return capability;
-  });
-
-  return isArray ? updatedCaps : updatedCaps[0];
+  envConfig =
+    OS === 'web'
+      ? require('./local/web.config')
+      : require('./local/mobile.config');
 }
 
-// --------------------
-// Export WDIO config as async promise (WDIO supports this)
-// --------------------
-exports.config = (async () => {
-  // Await your async setup
-  await setAllDetails.setExecutionDetails();
-
-  // Get environment-specific config object
-  const envConfigObj = envConfigFn(bsCaps);
-
-  // Ensure capabilities exist
-  envConfigObj.capabilities = getBrowserStackCapabilities(envConfigObj.capabilities, bsCaps);
-
-  // Merge with base config
-  const finalConfig = deepmerge(baseConfig, envConfigObj);
-
-  console.log('====> Final merged config ready for WDIO');
-
-  return finalConfig;
-})();
-// // --------------------
-// // Inject media files into BrowserStack capabilities
-// // --------------------
-// async function getBrowserStackCapabilities(baseCaps) {
-//   if (
-//     process.env.PLATFORM !== 'browserstack' &&
-//     process.env.PLATFORM !== 'browserstacklocal'
-//   ) {
-//     return baseCaps;
-//   }
-
-//   console.log('🟡 Raw Capabilities (Before):');
-//   console.log(JSON.stringify(baseCaps, null, 2));
-
-//   const isArray = Array.isArray(baseCaps);
-//   const capsArray = isArray ? baseCaps : [baseCaps];
-
-//   const updatedCaps = capsArray.map(async (capability) => {
-//     capability['bstack:options'] = capability['bstack:options'] || {};
-//     const bsOpts = capability['bstack:options'];
-
-
-//     const mediaFiles = JSON.parse(process.env.MEDIA_FILES);
-
-//     // ✅ Inject media files from YAML if present
-//     if (Array.isArray(mediaFiles) && mediaFiles.length > 0) {
-//       bsOpts.uploadMedia = mediaFiles;
-//       console.log('🟢 Uploading media files:', bsOpts.uploadMedia);
-//     }
-
-//     capability['bstack:options'] = bsOpts;
-
-//     return capability;
-//   });
-
-//  // return isArray ? updatedCaps : updatedCaps[0];
-// }
-
-// // Apply media injection
-// envConfig = await getBrowserStackCapabilities(envConfig, bsCaps);
 
-// console.log('====> Final Env Config:', JSON.stringify(envConfig, null, 2));
-// exports.config = deepmerge(baseConfig, envConfig(bsCaps));
+exports.config = deepmerge(baseConfig, envConfig(bsCaps));
 

package/package.json

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