Adding build callback url and username and access key

- Override username and access key from the command line args.
- Chnaged project notify url to build callback url.

Author: suryart

bin/commands/runs.js

@@ -15,6 +15,12 @@ module.exports = function run(args) {
   return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
     utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
+    // accept the username from command line if provided
+    utils.setUsername(bsConfig, args);
+
+    // accept the access key from command line if provided
+    utils.setAccessKey(bsConfig, args);
+
     // Validate browserstack.json values and parallels specified via arguments
     return capabilityHelper.validate(bsConfig, args).then(function (validated) {
       logger.info(validated);

bin/helpers/capabilityHelper.js

@@ -66,7 +66,7 @@ const caps = (bsConfig, zip) => {
       obj.project = bsConfig.run_settings.project || bsConfig.run_settings.project_name;
       obj.customBuildName = bsConfig.run_settings.customBuildName || bsConfig.run_settings.build_name;
       obj.callbackURL = bsConfig.run_settings.callback_url;
-      obj.projectNotifyURL = bsConfig.run_settings.project_notify_URL;
+      obj.projectNotifyURL = bsConfig.run_settings.build_callback_url;
       obj.parallels = bsConfig.run_settings.parallels;
     }
 
@@ -99,7 +99,7 @@ const validate = (bsConfig, args) => {
 
     // validate parallels specified in browserstack.json if parallels are not specified via arguments
     if (!Utils.isUndefined(args) && Utils.isUndefined(args.parallels) && !Utils.isParallelValid(bsConfig.run_settings.parallels)) reject(Constants.validationMessages.INVALID_PARALLELS_CONFIGURATION);
-  
+
     // if parallels specified via arguments validate only arguments
     if (!Utils.isUndefined(args) && !Utils.isUndefined(args.parallels) && !Utils.isParallelValid(args.parallels)) reject(Constants.validationMessages.INVALID_PARALLELS_CONFIGURATION);
 
@@ -111,7 +111,7 @@ const validate = (bsConfig, args) => {
     }catch(error){
       reject(Constants.validationMessages.INVALID_CYPRESS_JSON)
     }
-    
+
     resolve(Constants.validationMessages.VALIDATED);
   });
 }

bin/helpers/utils.js

@@ -76,6 +76,18 @@ exports.setParallels = (bsConfig, args) => {
   }
 }
 
+exports.setUsername = (bsConfig, args) => {
+  if (!this.isUndefined(args.username)) {
+    bsConfig['auth']['username'] = args.username;
+  }
+}
+
+exports.setAccessKey = (bsConfig, args) => {
+  if (!this.isUndefined(args.key)) {
+    bsConfig['auth']['access_key'] = args.key;
+  }
+}
+
 exports.isUndefined = value => (value === undefined || value === null);
 
 exports.isFloat = value => (Number(value) && Number(value) % 1 !== 0);

test/unit/bin/helpers/capabilityHelper.js

@@ -233,7 +233,7 @@ describe("capabilityHelper.js", () => {
           project_name: "sample project",
           build_name: "sample build",
           callback_url: "random url",
-          project_notify_URL: "random url",
+          build_callback_url: "random url",
         },
       };
       return capabilityHelper
@@ -374,7 +374,7 @@ describe("capabilityHelper.js", () => {
       it("validate parallels present in bsconfig run settings (not a number) when not specified in arguments", () => {
 
         bsConfig.run_settings.parallels = "cypress";
-         
+
         return capabilityHelper
           .validate(bsConfig, { parallels: undefined })
           .then(function (data) {