Skip to content

Commit 0f01ab8

Browse files
committed
Merge pull request #4 from browserstack/force_proxy
Force proxy
2 parents b4aba3e + 63caf2a commit 0f01ab8

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/browserstack/local.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def add_args(key, value=nil)
4545
@logfile = value
4646
elsif key == "binarypath"
4747
@binary_path = value
48+
elsif key == "forceproxy" && value.to_s != "false"
49+
@force_proxy_flag = "-forceproxy"
4850
end
4951
end
5052

@@ -113,11 +115,11 @@ def stop
113115
end
114116

115117
def command
116-
"#{@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
118+
"#{@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
117119
end
118120

119121
def command_args
120-
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}"]
122+
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}"]
121123
args = args.select {|a| a.to_s != "" }
122124
args.push(:err => [:child, :out])
123125
args

test/browserstack-local-test.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ def test_set_proxy
7272
assert_match /\-proxyHost \'localhost\' \-proxyPort 8080 \-proxyUser \'user\' \-proxyPass \'pass\'/, @bs_local.command
7373
end
7474

75+
def test_force_proxy
76+
@bs_local.add_args "forceproxy"
77+
assert_match /\-forceproxy/, @bs_local.command
78+
end
79+
7580
def test_hosts
7681
@bs_local.add_args "hosts", "localhost,8080,0"
7782
assert_match /localhost\,8080\,0/, @bs_local.command

0 commit comments

Comments
 (0)