Merge branch 'master' of https://github.com/browserstack/browserstack…

…-cypress-cli into build_artifacts_logging
browserstack · Oct 8, 2024 · bfdfd52 · bfdfd52
2 parents 6a6bb55 + a2cbd75
commit bfdfd52
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 5 deletions.
diff --git a/bin/commands/runs.js b/bin/commands/runs.js
@@ -326,6 +326,9 @@ module.exports = function run(args, rawArgs) {
                 }
                 let message = `${data.message}! ${Constants.userMessages.BUILD_CREATED} with build id: ${data.build_id}`;
                 let dashboardLink = `${Constants.userMessages.VISIT_DASHBOARD} ${data.dashboard_url}`;
+                if (turboScaleSession) {
+                  dashboardLink = `${Constants.userMessages.VISIT_ATS_DASHBOARD} ${data.dashboard_url}`;
+                }
                 buildReportData = { 'build_id': data.build_id, 'parallels': userSpecifiedParallels, ...buildReportData }
                 utils.exportResults(data.build_id, `${config.dashboardUrl}${data.build_id}`);
                 if ((utils.isUndefined(bsConfig.run_settings.parallels) && utils.isUndefined(args.parallels)) || (!utils.isUndefined(bsConfig.run_settings.parallels) && bsConfig.run_settings.parallels == Constants.cliMessages.RUN.DEFAULT_PARALLEL_MESSAGE)) {
@@ -388,6 +391,8 @@ module.exports = function run(args, rawArgs) {
                         logger.info(Constants.userMessages.BUILD_FAILED_ERROR)
                         process.exitCode = Constants.BUILD_FAILED_EXIT_CODE;
                       });
+                    } else {
+                      utils.handleSyncExit(exitCode, data.dashboard_url);
                     }
                   });
                 } else if (utils.nonEmptyArray(bsConfig.run_settings.downloads && !turboScaleSession)) {

diff --git a/bin/helpers/archiver.js b/bin/helpers/archiver.js
@@ -72,9 +72,30 @@ const archiveSpecs = (runSettings, filePath, excludeFiles, md5data) => {
       });
     }
 
+    // Split mac and win configs
+    let macPackageJSON = {};
+    let winPackageJSON = {};
+    Object.assign(macPackageJSON, packageJSON);
+    Object.assign(winPackageJSON, packageJSON);
+
+    if (typeof runSettings.npm_dependencies === 'object') {
+      let macNpmDependencies = Object.assign({}, runSettings.npm_dependencies, runSettings.mac_npm_dependencies || {});
+      let winNpmDependencies = Object.assign({}, runSettings.npm_dependencies, runSettings.win_npm_dependencies || {});
+
+      Object.assign(macPackageJSON, {
+        devDependencies: macNpmDependencies,
+      });
+
+      Object.assign(winPackageJSON, {
+        devDependencies: winNpmDependencies,
+      });
+    }
+
     if (Object.keys(packageJSON).length > 0) {
-      let packageJSONString = JSON.stringify(packageJSON, null, 4);
-      archive.append(packageJSONString, {name: `${cypressAppendFilesZipLocation}browserstack-package.json`});
+      const macPackageJSONString = JSON.stringify(macPackageJSON, null, 4);
+      const winPackageJSONString = JSON.stringify(winPackageJSON, null, 4);
+      archive.append(macPackageJSONString, {name: `${cypressAppendFilesZipLocation}browserstack-mac-package.json`});
+      archive.append(winPackageJSONString, {name: `${cypressAppendFilesZipLocation}browserstack-win-package.json`});
     }
 
     //Create copy of package.json

diff --git a/bin/helpers/checkUploaded.js b/bin/helpers/checkUploaded.js
@@ -1,5 +1,6 @@
 'use strict';
 const request = require('request');
+const { combineMacWinNpmDependencies } = require('./helper');
 
 const crypto = require('crypto'),
   Constants = require('./constants'),
@@ -59,7 +60,7 @@ const checkPackageMd5 = (runSettings) => {
 
   if (typeof runSettings.npm_dependencies === 'object') {
     Object.assign(packageJSON, {
-      devDependencies: utils.sortJsonKeys(runSettings.npm_dependencies),
+      devDependencies: utils.sortJsonKeys(combineMacWinNpmDependencies(runSettings)),
     });
   }
 

diff --git a/bin/helpers/constants.js b/bin/helpers/constants.js
@@ -57,6 +57,7 @@ const userMessages = {
   FAILED_MD5_CHECK:
     "Something went wrong - you can retry running browserstack-cypress with ‘--force-upload’ parameter, or contact BrowserStack Support.",
   VISIT_DASHBOARD: "Visit the Automate dashboard for real-time test reporting:",
+  VISIT_ATS_DASHBOARD: "Visit the Automate TurboScale dashboard for real-time test reporting:",
   CONFLICTING_INIT_ARGUMENTS:
     "Conflicting arguments given. You can use --path only with a file name, and not with a file path.",
   NO_PARALLELS:
@@ -343,7 +344,11 @@ const filesToIgnoreWhileUploading = [
   "package.json",
   "**/package.json",
   "browserstack-package.json",
+  "browserstack-mac-package.json",
+  "browserstack-win-package.json",
   "**/browserstack-package.json",
+  "**/browserstack-mac-package.json",
+  "**/browserstack-win-package.json",
   "tests.zip",
   "**/tests.zip",
   "cypress.json",

diff --git a/bin/helpers/helper.js b/bin/helpers/helper.js
@@ -441,3 +441,7 @@ exports.truncateString = (field, truncateSizeInBytes) => {
 
   return field;
 };
+
+exports.combineMacWinNpmDependencies = (runSettings) => {
+  return Object.assign({}, runSettings.npm_dependencies, runSettings.win_npm_dependencies || {}, runSettings.mac_npm_dependencies || {})
+};
diff --git a/bin/helpers/packageInstaller.js b/bin/helpers/packageInstaller.js
@@ -12,6 +12,8 @@
   cliUtils = require("./utils"),
   util = require('util');
 
+const { combineMacWinNpmDependencies } = require("./helper");
+
 let nodeProcess;
 
 const setupPackageFolder = (runSettings, directoryPath) => {
@@ -29,9 +31,10 @@ const setupPackageFolder = (runSettings, directoryPath) => {
           Object.assign(packageJSON, runSettings.package_config_options);
         }
 
+        // Combine win and mac specific dependencies if present
         if (typeof runSettings.npm_dependencies === 'object') {
           Object.assign(packageJSON, {
-            devDependencies: runSettings.npm_dependencies,
+            devDependencies: combineMacWinNpmDependencies(runSettings),
           });
         }
 

diff --git a/bin/helpers/utils.js b/bin/helpers/utils.js
@@ -222,6 +222,16 @@ exports.setDefaults = (bsConfig, args) => {
     bsConfig.run_settings.npm_dependencies = {}
   }
 
+  // setting win_npm_dependencies to {} if not present
+  if (bsConfig.run_settings && this.isUndefined(bsConfig.run_settings.win_npm_dependencies)) {
+    bsConfig.run_settings.win_npm_dependencies = {}
+  }
+
+  // setting mac_npm_dependencies to {} if not present
+  if (bsConfig.run_settings && this.isUndefined(bsConfig.run_settings.mac_npm_dependencies)) {
+    bsConfig.run_settings.mac_npm_dependencies = {}
+  }
+
   // setting connection_settings to {} if not present
   if (this.isUndefined(bsConfig.connection_settings)) {
     bsConfig.connection_settings = {};

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browserstack-cypress-cli",
-  "version": "1.31.6",
+  "version": "1.31.8",
   "description": "BrowserStack Cypress CLI for Cypress integration with BrowserStack's remote devices.",
   "main": "index.js",
   "scripts": {