brynary · EddM · Mar 12, 2011 · Mar 12, 2011
diff --git a/lib/webrat/core/configuration.rb b/lib/webrat/core/configuration.rb
@@ -68,6 +68,9 @@ def application_port_for_selenium
     # Set the firefox profile for selenium to use
     attr_accessor :selenium_firefox_profile
 
+    # Set Browser-specific options for Selenium session
+    attr_accessor :selenium_browser_options
+
     # How many redirects to the same URL should be halted as an infinite redirect
     # loop? Defaults to 10
     attr_accessor :infinite_redirect_limit
@@ -87,6 +90,7 @@ def initialize # :nodoc:
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
       self.selenium_verbose_output = false
+      self.selenium_browser_options = {}
 
       tmp_dir = Pathname.new(Dir.pwd).join("tmp")
       self.saved_pages_dir = tmp_dir.exist? ? tmp_dir : Dir.pwd

diff --git a/lib/webrat/selenium/selenium_session.rb b/lib/webrat/selenium/selenium_session.rb
@@ -227,7 +227,7 @@ def setup #:nodoc:
       Webrat::Selenium::ApplicationServerFactory.app_server_instance.boot
 
       create_browser
-      $browser.start
+      $browser.start_new_browser_session(Webrat.configuration.selenium_browser_options)
 
       extend_selenium
       define_location_strategies

diff --git a/vendor/selenium-server.jar b/vendor/selenium-server.jar