Skip to content
Browse files

[#242 state:resolved] timeout was in wrong spot

  • Loading branch information...
1 parent fd431f2 commit e2d6b066bdc75f970b853aaeb116eccc166a895f @gaffo gaffo committed May 18, 2009
Showing with 6 additions and 3 deletions.
  1. +1 −1 lib/webrat/selenium/selenium_rc_server.rb
  2. +5 −2 lib/webrat/selenium/selenium_session.rb
View
2 lib/webrat/selenium/selenium_rc_server.rb
@@ -34,7 +34,7 @@ def remote_control
@remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
Webrat.configuration.selenium_server_port,
- Webrat.configuration.selenium_browser_startup_timeout)
+ 5)
@remote_control.jar_file = jar_path
return @remote_control
View
7 lib/webrat/selenium/selenium_session.rb
@@ -201,8 +201,11 @@ 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}")
+ $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}",
+ :timeout_in_seconds => Webrat.configuration.selenium_browser_startup_timeout)
$browser.set_speed(0) unless Webrat.configuration.selenium_server_address
at_exit do

0 comments on commit e2d6b06

Please sign in to comment.
Something went wrong with that request. Please try again.