From 57ff8d302e0be04044acfce7e94dfc3e0abbc834 Mon Sep 17 00:00:00 2001
From: Saurav Das <saurav.d@browserstack.com>
Date: Thu, 17 Aug 2023 21:42:24 +0530
Subject: [PATCH 1/2] fix: Git mapping for windows

---
 bin/testObservability/helper/helper.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/testObservability/helper/helper.js b/bin/testObservability/helper/helper.js
index 1fd1353f..d8b010b0 100644
--- a/bin/testObservability/helper/helper.js
+++ b/bin/testObservability/helper/helper.js
@@ -163,7 +163,7 @@ exports.getTestEnv = () => {
 }
 
 exports.getFileSeparatorData = () => {
-  const fileSeparatorRegex = /^win/.test(process.platform) ? "\\\\" : "/";
+  const fileSeparatorRegex = /^win/.test(process.platform) ? "\\" : "/";
   const fileSeparator = /^win/.test(process.platform) ? "\\" : "/";
   return {
     fileSeparator,
@@ -1003,7 +1003,7 @@ exports.runCypressTestsLocally = (bsConfig, args, rawArgs) => {
     const cypressProcess = spawn(
       'npx',
       ['cypress', 'run', ...getReRunSpecs(rawArgs.slice(1)), ...getLocalSessionReporter()],
-      { stdio: 'inherit', cwd: process.cwd(), env: process.env }
+      { stdio: 'inherit', cwd: process.cwd(), env: process.env, shell: true }
     );
     cypressProcess.on('close', async (code) => {
       logger.info(`Cypress process exited with code ${code}`);

From 29ef187ad01e22eb9f82197f5777dd192a01b1d5 Mon Sep 17 00:00:00 2001
From: Saurav Das <saurav.d@browserstack.com>
Date: Fri, 18 Aug 2023 17:45:17 +0530
Subject: [PATCH 2/2] refactor: Resolve review comments

---
 bin/testObservability/helper/helper.js  | 11 +++--------
 bin/testObservability/reporter/index.js |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/bin/testObservability/helper/helper.js b/bin/testObservability/helper/helper.js
index d8b010b0..22906dde 100644
--- a/bin/testObservability/helper/helper.js
+++ b/bin/testObservability/helper/helper.js
@@ -163,16 +163,11 @@ exports.getTestEnv = () => {
 }
 
 exports.getFileSeparatorData = () => {
-  const fileSeparatorRegex = /^win/.test(process.platform) ? "\\" : "/";
-  const fileSeparator = /^win/.test(process.platform) ? "\\" : "/";
-  return {
-    fileSeparator,
-    fileSeparatorRegex
-  };
+  return /^win/.test(process.platform) ? "\\" : "/";
 }
 
 exports.findGitConfig = (filePath) => {
-  const { fileSeparator, fileSeparatorRegex } = exports.getFileSeparatorData();
+  const fileSeparator = exports.getFileSeparatorData();
   if(filePath == null || filePath == '' || filePath == fileSeparator) {
     return null;
   }
@@ -180,7 +175,7 @@ exports.findGitConfig = (filePath) => {
     fs.statSync(filePath + fileSeparator + '.git' + fileSeparator + 'config');
     return filePath;
   } catch(e) {
-    let parentFilePath = filePath.split(fileSeparatorRegex);
+    let parentFilePath = filePath.split(fileSeparator);
     parentFilePath.pop();
     return exports.findGitConfig(parentFilePath.join(fileSeparator));
   }
diff --git a/bin/testObservability/reporter/index.js b/bin/testObservability/reporter/index.js
index d8c0c200..0eafa93e 100644
--- a/bin/testObservability/reporter/index.js
+++ b/bin/testObservability/reporter/index.js
@@ -284,7 +284,7 @@ class MyReporter {
       if(!isBrowserstackInfra()) gitConfigPath = process.env.OBSERVABILITY_GIT_CONFIG_PATH_LOCAL ? process.env.OBSERVABILITY_GIT_CONFIG_PATH_LOCAL.toString() : null;
       const prefixedTestPath = rootParentFile ? this._paths.prefixTestPath(rootParentFile) : 'File path could not be found';
       
-      const { fileSeparator, fileSeparatorRegex } = getFileSeparatorData();
+      const fileSeparator = getFileSeparatorData();
       
       let testData = {
         'framework': 'Cypress',