Add default selenium_additional_args value of an empty array and no l…

…onger check if it is nil.
moutten · Feb 25, 2010 · 3493768 · 3493768
1 parent 5a1ee60
commit 3493768
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/webrat/core/configuration.rb b/lib/webrat/core/configuration.rb
@@ -82,7 +82,8 @@ def initialize # :nodoc:
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
-
+      self.selenium_additional_args = []
+
       tmp_dir = Pathname.new(Dir.pwd).join("tmp")
       self.saved_pages_dir = tmp_dir.exist? ? tmp_dir : Dir.pwd
     end

diff --git a/lib/webrat/selenium/selenium_rc_server.rb b/lib/webrat/selenium/selenium_rc_server.rb
@@ -35,7 +35,7 @@ def remote_control
         @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
                                                                        Webrat.configuration.selenium_server_port,
                                                                        :timeout => Webrat.configuration.selenium_browser_startup_timeout)
-        @remote_control.additional_args << Webrat.configuration.selenium_additional_args unless Webrat.configuration.selenium_additional_args.nil?
+        @remote_control.additional_args = Webrat.configuration.selenium_additional_args
         @remote_control.jar_file = jar_path
 
         return @remote_control