Merge branch 'master' into OB-2088-git-linking

Author: sauravdas1997

bin/helpers/utils.js

@@ -942,6 +942,12 @@ exports.setLocalArgs = (bsConfig, args) => {
   let local_args = {}
   local_args['key'] = bsConfig['auth']['access_key'];
   local_args['localIdentifier'] = bsConfig["connection_settings"]["local_identifier"];
+  if (bsConfig["connection_settings"]["proxyHost"])
+    local_args['proxyHost'] = bsConfig["connection_settings"]["proxyHost"];
+  if (bsConfig["connection_settings"]["proxyPort"])
+    local_args['proxyPort'] = bsConfig["connection_settings"]["proxyPort"];
+  if (bsConfig["connection_settings"]["useCaCertificate"])
+    local_args['useCaCertificate'] = bsConfig["connection_settings"]["useCaCertificate"];
   local_args['daemon'] = true;
   local_args['enable-logging-for-api'] = true
   local_args['source'] = `cypress:${usageReporting.cli_version_and_path(bsConfig).version}`;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserstack-cypress-cli",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "description": "BrowserStack Cypress CLI for Cypress integration with BrowserStack's remote devices.",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "archiver": "5.3.0",
     "async": "3.2.3",
-    "browserstack-local": "1.5.1",
+    "browserstack-local": "1.5.4",
     "chalk": "4.1.2",
     "cli-progress": "3.10.0",
     "fs-extra": "8.1.0",