diff --git a/lib/webrat/core/configuration.rb b/lib/webrat/core/configuration.rb index 4e46a674..5963989e 100755 --- a/lib/webrat/core/configuration.rb +++ b/lib/webrat/core/configuration.rb @@ -76,6 +76,9 @@ def application_port_for_selenium # Defaults to false attr_accessor :selenium_verbose_output + # Set the javascript framework for selenium to use + attr_accessor :javascript_framework + def initialize # :nodoc: self.open_error_files = true self.application_environment = :test @@ -87,6 +90,7 @@ def initialize # :nodoc: self.selenium_browser_key = '*firefox' self.selenium_browser_startup_timeout = 5 self.selenium_verbose_output = false + self.javascript_framework = :jquery 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 index f97b3357..45e9514a 100644 --- a/lib/webrat/selenium/selenium_session.rb +++ b/lib/webrat/selenium/selenium_session.rb @@ -236,12 +236,13 @@ def setup #:nodoc: def create_browser - $browser = ::Selenium::Client::Driver.new( - Webrat.configuration.selenium_server_address || "localhost", - Webrat.configuration.selenium_server_port, - Webrat.configuration.selenium_browser_key, - "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port_for_selenium}" - ) + $browser = ::Selenium::Client::Driver.new({ + :host => Webrat.configuration.selenium_server_address || "localhost", + :port => Webrat.configuration.selenium_server_port, + :browser => Webrat.configuration.selenium_browser_key, + :url => "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port_for_selenium}", + :javascript_framework => Webrat.configuration.javascript_framework + }) $browser.set_speed(0) unless Webrat.configuration.selenium_server_address at_exit do