Merge pull request #4 from browserstack/force_proxy

Force proxy

Author: tr4n2uil

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

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