Merge branch 'master' into HST_1588_cyp_o11y_ats2

Author: Ankit098

bin/accessibility-automation/cypress/index.js

@@ -333,6 +333,8 @@ afterEach(() => {
             let filePath = '';
             if (attributes.invocationDetails !== undefined && attributes.invocationDetails.relativeFile !== undefined) {
                 filePath = attributes.invocationDetails.relativeFile;
+            } else if (attributes.prevAttempts && attributes.prevAttempts.length > 0) {
+                filePath = (attributes.prevAttempts[0].invocationDetails && attributes.prevAttempts[0].invocationDetails.relativeFile) || '';
             }
             const payloadToSend = {
                 "saveResults": shouldScanTestForAccessibility,
@@ -422,7 +424,10 @@ Cypress.Commands.add('getAccessibilityResults', () => {
 	}
 });
 
-Cypress.Commands.addQuery('performScanSubjectQuery', function (chaining, setTimeout) {
-    this.set('timeout', setTimeout);
-    return () => cy.getSubjectFromChain(chaining);
-});
+if (!Cypress.Commands.hasOwnProperty('_browserstackSDKQueryAdded')) {
+    Cypress.Commands.addQuery('performScanSubjectQuery', function (chaining, setTimeout) {
+        this.set('timeout', setTimeout);
+        return () => cy.getSubjectFromChain(chaining);
+    });
+    Cypress.Commands._browserstackSDKQueryAdded = true;
+}

bin/commands/runs.js

@@ -368,10 +368,10 @@ module.exports = function run(args, rawArgs) {
                       }
 
                       // Generate custom report!
-                      reportGenerator(bsConfig, data.build_id, args, rawArgs, buildReportData, function(){
+                      reportGenerator(bsConfig, data.build_id, args, rawArgs, buildReportData, function(modifiedExitCode=exitCode){
                         utils.sendUsageReport(bsConfig, args, `${message}\n${dashboardLink}`, Constants.messageTypes.SUCCESS, null, buildReportData, rawArgs);
                         markBlockEnd('postBuild');
-                        utils.handleSyncExit(exitCode, data.dashboard_url);
+                        utils.handleSyncExit(modifiedExitCode, data.dashboard_url);
                       });
                     } else if(!turboScaleSession){
                       let stacktraceUrl = getStackTraceUrl();

bin/helpers/reporterHTML.js

@@ -105,6 +105,9 @@ let reportGenerator = async (bsConfig, buildId, args, rawArgs, buildReportData,
     logger.error('Generating the build report failed.');
     logger.error(utils.formatRequest(error.response.statusText, error.response, error.response.data));
     utils.sendUsageReport(bsConfig, args, message, messageType, errorCode, buildReportData, rawArgs);
+    if (cb){
+      cb(Constants.ERROR_EXIT_CODE);
+    }
     return;
   }
 }

bin/helpers/utils.js

@@ -1179,10 +1179,17 @@ exports.getNumberOfSpecFiles = (bsConfig, args, cypressConfig, turboScaleSession
   logger.debug(`${files ? files.length : 0} spec files found`);
 
   if (turboScaleSession) {
-    // remove unwanted path prefix for turboscale
-    files = files.map((x) => { return path.join(testFolderPath, x.split(testFolderPath)[1]) })
-    // setting specs for turboScale as we don't have patched API for turboscale so we will rely on info from CLI
-    bsConfig.run_settings.specs = files;
+    if (bsConfig.run_settings.cypress_config_file && bsConfig.run_settings.cypress_config_filename !== 'false') {
+      const configFilePath = path.resolve(bsConfig.run_settings.cypressConfigFilePath);
+      const directory = path.join(path.dirname(configFilePath), '/');
+      // remove unwanted path prefix for turboscale
+      files = files.map((x) => { return path.join('', x.split(directory)[1]) })
+      // setting specs for turboScale as we don't have patched API for turboscale so we will rely on info from CLI
+      bsConfig.run_settings.specs = files;
+    } else {
+      files = files.map((x) => { return path.join(testFolderPath, x.split(testFolderPath)[1]) })
+      bsConfig.run_settings.specs = files;
+    }
   }
   return files;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserstack-cypress-cli",
-  "version": "1.32.2",
+  "version": "1.32.5",
   "description": "BrowserStack Cypress CLI for Cypress integration with BrowserStack's remote devices.",
   "main": "index.js",
   "scripts": {