Merge branch 'master' of github.com:browserstack/browserstack-cypress-cli into sync-cli-log-changes

Author: karanshah-browserstack

bin/commands/info.js

@@ -18,6 +18,9 @@ module.exports = function info(args) {
 
     utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
+    // set cypress config filename
+    utils.setCypressConfigFilename(bsConfig, args);
+
     let buildId = args._[1];
 
     let options = {

bin/commands/init.js

@@ -13,6 +13,8 @@ function get_path(args) {
     if (filename !== path.basename(filename)) {
       let message = Constants.userMessages.CONFLICTING_INIT_ARGUMENTS;
       logger.error(message);
+      // set cypress config filename
+      utils.setCypressConfigFilename(args.bstack_config, args);
       utils.sendUsageReport(null, args, message, Constants.messageTypes.ERROR, 'conflicting_path_json_init');
       return;
     }

bin/commands/stop.js

@@ -18,6 +18,9 @@ module.exports = function stop(args) {
 
     utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
+    // set cypress config filename
+    utils.setCypressConfigFilename(bsConfig, args);
+
     let buildId = args._[1];
 
     let options = {

bin/helpers/config.js

@@ -1,6 +1,6 @@
 var config = require('./config.json');
 
-config.env = process.env.NODE_ENV || "production";
+config.env = process.env.BSTACK_CYPRESS_NODE_ENV || "production";
 
 if(config.env !== "production") {
   // load config based on env

bin/helpers/usageReporting.js

@@ -33,8 +33,8 @@ function local_cypress_version(bsConfig) {
   // 1. check version of Cypress installed in local project
   // 2. check version of Cypress installed globally if not present in project
 
-  if (bsConfig) {
-    let version = get_version(path.join(bsConfig.run_settings.cypress_proj_dir, 'node_modules', '.bin', 'cypress'));
+  if (bsConfig && bsConfig.run_settings.cypressProjectDir) {
+    let version = get_version(path.join(bsConfig.run_settings.cypressProjectDir, 'node_modules', '.bin', 'cypress'));
     if (!version) {
       version = get_version('cypress');
     }
@@ -80,8 +80,8 @@ function cli_version_and_path(bsConfig) {
   // 1. check version of Cypress installed in local project
   // 2. check version of Cypress installed globally if not present in project
 
-  if (bsConfig) {
-    let _path = path.join(bsConfig.run_settings.cypress_proj_dir, 'node_modules', 'browserstack-cypress');
+  if (bsConfig && bsConfig.run_settings.cypressProjectDir) {
+    let _path = path.join(bsConfig.run_settings.cypressProjectDir, 'node_modules', 'browserstack-cypress');
     let version = get_version(_path);
     if (!version) {
       version = get_version('browserstack-cypress');

bin/helpers/utils.js

@@ -164,7 +164,7 @@ exports.setCypressConfigFilename = (bsConfig, args) => {
 
   bsConfig.run_settings.userProvidedCypessConfigFile = (userProvidedCypessConfigFile || (!this.isUndefined(bsConfig.run_settings.cypress_config_file)));
 
-  if (userProvidedCypessConfigFile || this.isUndefined(bsConfig.run_settings.cypress_config_file)) {
+  if ((userProvidedCypessConfigFile || this.isUndefined(bsConfig.run_settings.cypress_config_file)) && !this.isUndefined(args.cypressConfigFile)) {
     bsConfig.run_settings.cypress_config_file = args.cypressConfigFile;
     bsConfig.run_settings.cypress_config_filename = path.basename(args.cypressConfigFile);
   } else if (!this.isUndefined(bsConfig.run_settings.cypress_config_file)) {
@@ -219,7 +219,7 @@ exports.isParallelValid = (value) => {
 }
 
 exports.getUserAgent = () => {
-  return `BStack-Cypress-CLI/1.5.0 (${os.arch()}/${os.platform()}/${os.release()})`;
+  return `BStack-Cypress-CLI/1.5.1 (${os.arch()}/${os.platform()}/${os.release()})`;
 };
 
 exports.isAbsolute = (configPath) => {

package.json

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