From 3b96ffdbdf89c8179f80d3d220cd0bebea27d508 Mon Sep 17 00:00:00 2001 From: Nidhi Makhijani Date: Wed, 6 Apr 2016 17:58:52 +0530 Subject: [PATCH 1/2] force proxy --- lib/browserstack/local.rb | 6 ++++-- test/browserstack-local-test.rb | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/browserstack/local.rb b/lib/browserstack/local.rb index 874f0b0..8f071c1 100644 --- a/lib/browserstack/local.rb +++ b/lib/browserstack/local.rb @@ -45,6 +45,8 @@ def add_args(key, value=nil) @logfile = value elsif key == "binarypath" @binary_path = value + elsif key == "forceproxy" && value.to_s != "false" + @force_proxy_flag = "-forceproxy" end end @@ -113,11 +115,11 @@ def stop end def command - "#{@exec} #{@binary_path} -logFile '#{@logfile}' #{@folder_flag} #{@key} #{@folder_path} #{@force_local_flag} #{@local_identifier_flag} #{@only_flag} #{@only_automate_flag} #{@proxy_host} #{@proxy_port} #{@proxy_user} #{@proxy_pass} #{@force_flag} #{@verbose_flag} #{@hosts}".strip + "#{@exec} #{@binary_path} -logFile '#{@logfile}' #{@folder_flag} #{@key} #{@folder_path} #{@force_local_flag} #{@local_identifier_flag} #{@only_flag} #{@only_automate_flag} #{@proxy_host} #{@proxy_port} #{@proxy_user} #{@proxy_pass} #{@force_proxy_flag} #{@force_flag} #{@verbose_flag} #{@hosts}".strip end def command_args - args = ["#{@binary_path}", "-logFile", "#{@logfile}", "#{@key}", "#{@folder_flag}", "#{@folder_path}", "#{@force_local_flag}", "#{@local_identifier_flag}", "#{@only_flag}", "#{@only_automate_flag}", "#{@proxy_host}", "#{@proxy_port}", "#{@proxy_user}", "#{@proxy_pass}", "#{@force_flag}", "#{@verbose_flag}", "#{@hosts}"] + args = ["#{@binary_path}", "-logFile", "#{@logfile}", "#{@key}", "#{@folder_flag}", "#{@folder_path}", "#{@force_local_flag}", "#{@local_identifier_flag}", "#{@only_flag}", "#{@only_automate_flag}", "#{@proxy_host}", "#{@proxy_port}", "#{@proxy_user}", "#{@proxy_pass}", "{@force_proxy_flag}","#{@force_flag}", "#{@verbose_flag}", "#{@hosts}"] args = args.select {|a| a.to_s != "" } args.push(:err => [:child, :out]) args diff --git a/test/browserstack-local-test.rb b/test/browserstack-local-test.rb index eb35c56..b24e03a 100644 --- a/test/browserstack-local-test.rb +++ b/test/browserstack-local-test.rb @@ -72,6 +72,11 @@ def test_set_proxy assert_match /\-proxyHost \'localhost\' \-proxyPort 8080 \-proxyUser \'user\' \-proxyPass \'pass\'/, @bs_local.command end + def test_force_proxy + @bs_local.add_args "forceproxy" + assert_match /\-forceproxy/, @bs_local.command + end + def test_hosts @bs_local.add_args "hosts", "localhost,8080,0" assert_match /localhost\,8080\,0/, @bs_local.command From 63caf2a44429dccc6ab667ca02e3beda97c50937 Mon Sep 17 00:00:00 2001 From: Nidhi Makhijani Date: Wed, 6 Apr 2016 18:03:39 +0530 Subject: [PATCH 2/2] typo --- lib/browserstack/local.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/browserstack/local.rb b/lib/browserstack/local.rb index 8f071c1..41f581a 100644 --- a/lib/browserstack/local.rb +++ b/lib/browserstack/local.rb @@ -119,7 +119,7 @@ def command end def command_args - args = ["#{@binary_path}", "-logFile", "#{@logfile}", "#{@key}", "#{@folder_flag}", "#{@folder_path}", "#{@force_local_flag}", "#{@local_identifier_flag}", "#{@only_flag}", "#{@only_automate_flag}", "#{@proxy_host}", "#{@proxy_port}", "#{@proxy_user}", "#{@proxy_pass}", "{@force_proxy_flag}","#{@force_flag}", "#{@verbose_flag}", "#{@hosts}"] + args = ["#{@binary_path}", "-logFile", "#{@logfile}", "#{@key}", "#{@folder_flag}", "#{@folder_path}", "#{@force_local_flag}", "#{@local_identifier_flag}", "#{@only_flag}", "#{@only_automate_flag}", "#{@proxy_host}", "#{@proxy_port}", "#{@proxy_user}", "#{@proxy_pass}", "#{@force_proxy_flag}","#{@force_flag}", "#{@verbose_flag}", "#{@hosts}"] args = args.select {|a| a.to_s != "" } args.push(:err => [:child, :out]) args