Merge pull request #224 from japneetlambdatest/CYP-600

validations added and DP changes

Author: japneetlambdatest

commands/utils/set_args.js

@@ -202,6 +202,12 @@ function sync_args_from_cmd(args) {
       lt_config["tunnel_settings"]["tunnel_name"] = "";
     }
 
+    // to avoid passing tunnel name to upstream service if tunnel is false
+    if  (lt_config["tunnel_settings"]["tunnel"]==false){
+      lt_config["tunnel_settings"]["tunnel_name"]=null
+    }
+
+
     //add browsers from cli
     if ("browsers" in args) {
       browsers = args["browsers"].split(",");
@@ -401,6 +407,15 @@ function sync_args_from_cmd(args) {
       console.log("resolution set to ", args.res);
       lt_config.run_settings.resolution = args.res;
     }
+    //Set values for Dedicated proxy
+    if ("dedicated_proxy" in args) {
+      lt_config["run_settings"]["dedicated_proxy"] = true
+        ? args["dedicated_proxy"] == "true"
+        : false;
+    } else if (!lt_config["run_settings"]["dedicated_proxy"]) {
+      lt_config["run_settings"]["dedicated_proxy"] = false;
+    }
+
     //get specs from current directory if specs are not passed in config or cli
     if (
       (lt_config["run_settings"]["specs"] == undefined ||

commands/utils/validate.js

@@ -365,6 +365,27 @@ module.exports = validate_config = function (lt_config, validation_configs) {
       });
     }
 
+    //validate if dedicated proxy field contains expected value
+    if ("dedicated_proxy" in lt_config["run_settings"]) {
+      if (!(typeof lt_config["run_settings"]["dedicated_proxy"] === "boolean")) {
+        reject("Error!! boolean value is expected in dedicated_proxy key");
+      }
+    }
+
+    //validate if dedicatedproxy and tunnel are not passed simultaniously
+    if (lt_config["run_settings"]["dedicated_proxy"]==true && lt_config["run_settings"]["geo_location"] !=""){
+      reject("Error!! Dedicated Proxy and Geolocation can not be passed in same run")
+    }
+    //validate if tunnel and geo are not passed simultaniously
+    if (lt_config["tunnel_settings"]["tunnel"]==true && lt_config["run_settings"]["geo_location"] !=""){
+      reject("Error!! Tunnel and Geolocation can not be passed in same run")
+    }
+    //validate if dedicatedproxy and geo are not passed simultaniously
+    if (lt_config["tunnel_settings"]["tunnel"]==true && lt_config["run_settings"]["dedicated_proxy"]==true){
+      reject("Error!! Tunnel and Dedicated Proxy can not be passed in same run")
+    }
+
+    if(lt_config)
     resolve(cypress_version);
   });
 };

index.js

@@ -179,6 +179,11 @@ const argv = require("yargs")
           alias: "resolution",
           describe: "machine resolution",
           type: "string",
+        })
+        .option("dp", {
+          alias: "dedicated_proxy",
+          describe: "dedicated proxy",
+          type: "bool",
         });
     },
     function (argv) {