From dd98b337131a73bf69d17db517500e2055d910e5 Mon Sep 17 00:00:00 2001 From: Brian Landau Date: Mon, 6 Jul 2009 13:50:00 -0400 Subject: [PATCH] Make compatable with latest version of "selenium-client" gem, version 1.2.16 --- lib/webrat/selenium.rb | 2 +- lib/webrat/selenium/selenium_rc_server.rb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/webrat/selenium.rb b/lib/webrat/selenium.rb index d47c583..42db25c 100644 --- a/lib/webrat/selenium.rb +++ b/lib/webrat/selenium.rb @@ -1,5 +1,5 @@ require "webrat" -gem "selenium-client", ">=1.2.14" +gem "selenium-client", ">=1.2.16" require "selenium/client" require "webrat/selenium/silence_stream" require "webrat/selenium/selenium_session" diff --git a/lib/webrat/selenium/selenium_rc_server.rb b/lib/webrat/selenium/selenium_rc_server.rb index 101e7e9..b38724d 100644 --- a/lib/webrat/selenium/selenium_rc_server.rb +++ b/lib/webrat/selenium/selenium_rc_server.rb @@ -34,7 +34,7 @@ module Webrat @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, - Webrat.configuration.selenium_browser_startup_timeout) + :timeout => Webrat.configuration.selenium_browser_startup_timeout) @remote_control.jar_file = jar_path return @remote_control @@ -74,7 +74,9 @@ module Webrat def stop silence_stream(STDOUT) do - ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop + ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", + Webrat.configuration.selenium_server_port, + :timeout => 5).stop end end