Merge branch 'master' into OB-1893-handle-empty-dependencies

Author: sauravdas1997

bin/helpers/utils.js

@@ -942,6 +942,12 @@ exports.setLocalArgs = (bsConfig, args) => {
   let local_args = {}
   local_args['key'] = bsConfig['auth']['access_key'];
   local_args['localIdentifier'] = bsConfig["connection_settings"]["local_identifier"];
+  if (bsConfig["connection_settings"]["proxyHost"])
+    local_args['proxyHost'] = bsConfig["connection_settings"]["proxyHost"];
+  if (bsConfig["connection_settings"]["proxyPort"])
+    local_args['proxyPort'] = bsConfig["connection_settings"]["proxyPort"];
+  if (bsConfig["connection_settings"]["useCaCertificate"])
+    local_args['useCaCertificate'] = bsConfig["connection_settings"]["useCaCertificate"];
   local_args['daemon'] = true;
   local_args['enable-logging-for-api'] = true
   local_args['source'] = `cypress:${usageReporting.cli_version_and_path(bsConfig).version}`;

bin/testObservability/cypress/index.js

@@ -2,11 +2,11 @@
 
 /* Used to detect Gherkin steps */
 Cypress.on('log:added', (log) => {
-  cy.now('task', 'test_observability_step', {
-    log
-  }, {log: false}).then((res) => {
-  }).catch((err) => {
-  });
+  return () => {
+    return cy.now('task', 'test_observability_step', {
+              log
+            }, {log: false})
+  }
 });
 
 Cypress.on('command:start', (command) => {

bin/testObservability/helper/helper.js

@@ -163,24 +163,19 @@ 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;
   }
   try {
     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));
   }
@@ -1002,7 +997,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}`);

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',
@@ -309,11 +309,14 @@ class MyReporter {
         'failure_type': !failureReason ? null : failureReason.match(/AssertionError/) ? 'AssertionError' : 'UnhandledError',
         'retry_of': test.retryOf,
         'meta': {
-          steps: JSON.parse(JSON.stringify(this.currentTestCucumberSteps))
+          steps: []
         }
       };
 
-      this.currentTestCucumberSteps = [];
+      if(eventType.match(/TestRunFinished/) || eventType.match(/TestRunSkipped/)) {
+        testData['meta'].steps = JSON.parse(JSON.stringify(this.currentTestCucumberSteps));
+        this.currentTestCucumberSteps = [];
+      }
 
       const { os, os_version } = await getOSDetailsFromSystem(process.env.observability_product);
       if(process.env.observability_integration) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserstack-cypress-cli",
-  "version": "1.25.0",
+  "version": "1.25.2",
   "description": "BrowserStack Cypress CLI for Cypress integration with BrowserStack's remote devices.",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "archiver": "5.3.0",
     "async": "3.2.3",
-    "browserstack-local": "1.5.1",
+    "browserstack-local": "1.5.4",
     "chalk": "4.1.2",
     "cli-progress": "3.10.0",
     "fs-extra": "8.1.0",