diabolo-webrat 0.4.2 → 0.4.3

data/lib/webrat/selenium/selenium_session.rb

@@ -1,4 +1,6 @@
 require "webrat/core/save_and_open_page"
+require "webrat/selenium/selenium_rc_server"
+require "webrat/selenium/application_server"
 
 module Webrat
   class TimeoutError < WebratError
@@ -39,7 +41,7 @@ module Webrat
 
     def fill_in(field_identifier, options)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
-      selenium.wait_for_element locator, 5
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.type(locator, "#{options[:with]}")
     end
 
@@ -62,7 +64,7 @@ module Webrat
       pattern ||= '*'
       locator = "button=#{pattern}"
 
-      selenium.wait_for_element locator, 5
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -71,7 +73,7 @@ module Webrat
     def click_link(link_text_or_regexp, options = {})
       pattern = adjust_if_regexp(link_text_or_regexp)
       locator = "webratlink=#{pattern}"
-      selenium.wait_for_element locator, 5
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -79,7 +81,7 @@ module Webrat
 
     def click_link_within(selector, link_text, options = {})
       locator = "webratlinkwithin=#{selector}|#{link_text}"
-      selenium.wait_for_element locator, 5
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -94,7 +96,7 @@ module Webrat
         select_locator = "webratselectwithoption=#{option_text}"
       end
 
-      selenium.wait_for_element select_locator, 5
+      selenium.wait_for_element select_locator, :timeout_in_seconds => 5
       selenium.select(select_locator, option_text)
     end
 
@@ -102,7 +104,7 @@ module Webrat
 
     def choose(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, 5
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -110,7 +112,7 @@ module Webrat
 
     def check(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, 5
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
     alias_method :uncheck, :check
@@ -179,6 +181,7 @@ module Webrat
     end
 
   protected
+
     def silence_stream(stream)
       old_stream = stream.dup
       stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
@@ -189,16 +192,11 @@ module Webrat
     end
 
     def setup #:nodoc:
-      silence_stream(STDOUT) do
-        silence_stream(STDERR) do
-          Webrat.start_selenium_server
-          Webrat.start_app_server
-        end
-      end
+      Webrat::Selenium::SeleniumRCServer.boot
+      Webrat::Selenium::ApplicationServer.boot
 
       create_browser
       $browser.start
-      teardown_at_exit
 
       extend_selenium
       define_location_strategies
@@ -210,14 +208,10 @@ module Webrat
       $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.set_speed(0) unless Webrat.configuration.selenium_server_address
-    end
 
-    def teardown_at_exit #:nodoc:
       at_exit do
         silence_stream(STDOUT) do
           $browser.stop
-          Webrat.stop_app_server
-          Webrat.stop_selenium_server
         end
       end
     end

data/lib/webrat/selenium.rb

@@ -1,86 +1,11 @@
 require "webrat"
-gem "selenium-client", ">=1.2.9"
+gem "selenium-client", ">=1.2.14"
 require "selenium/client"
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"
+require "webrat/core_extensions/tcp_socket"
 
 module Webrat
-
-  def self.with_selenium_server #:nodoc:
-    start_selenium_server
-    yield
-    stop_selenium_server
-  end
-
-  def self.start_selenium_server #:nodoc:
-    unless Webrat.configuration.selenium_server_address
-      remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5)
-      remote_control.jar_file = File.expand_path(__FILE__ + "../../../../vendor/selenium-server.jar")
-      remote_control.start :background => true
-    end
-    TCPSocket.wait_for_service :host => (Webrat.configuration.selenium_server_address || "0.0.0.0"), :port => Webrat.configuration.selenium_server_port
-  end
-
-  def self.stop_selenium_server #:nodoc:
-    ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop unless Webrat.configuration.selenium_server_address
-  end
-
-  def self.pid_file
-    if File.exists?('config.ru')
-      prepare_pid_file(Dir.pwd, 'rack.pid')
-    else
-      prepare_pid_file("#{RAILS_ROOT}/tmp/pids", "mongrel_selenium.pid")
-    end
-  end
-  # Start the appserver for the underlying framework to test
-  #
-  # Sinatra: requires a config.ru in the root of your sinatra app to use this
-  # Merb: Attempts to use bin/merb and falls back to the system merb
-  # Rails: Calls mongrel_rails to startup the appserver
-  def self.start_app_server
-    case Webrat.configuration.application_framework
-    when :sinatra
-      fork do
-        File.open('rack.pid', 'w') { |fp| fp.write Process.pid }
-        exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
-      end
-    when :merb
-      cmd = 'merb'
-      if File.exist?('bin/merb')
-        cmd = 'bin/merb'
-      end
-      system("#{cmd} -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}")
-    else # rails
-      system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
-    end
-    TCPSocket.wait_for_service :host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i
-  end
-
-  # Stop the appserver for the underlying framework under test
-  #
-  # Sinatra: Reads and kills the pid from the pid file created on startup
-  # Merb: Reads and kills the pid from the pid file created on startup
-  # Rails: Calls mongrel_rails stop to kill the appserver
-  def self.stop_app_server 
-    case Webrat.configuration.application_framework
-    when :sinatra
-      pid = File.read('rack.pid')
-      system("kill -9 #{pid}")
-      FileUtils.rm_f 'rack.pid'
-    when :merb
-      pid = File.read("log/merb.#{Webrat.configuration.application_port}.pid")
-      system("kill -9 #{pid}")
-      FileUtils.rm_f "log/merb.#{Webrat.configuration.application_port}.pid"
-    else # rails
-      system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
-    end
-  end
-
-  def self.prepare_pid_file(file_path, pid_file_name)
-    FileUtils.mkdir_p File.expand_path(file_path)
-    File.expand_path("#{file_path}/#{pid_file_name}")
-  end
-
   # To use Webrat's Selenium support, you'll need the selenium-client gem installed.
   # Activate it with (for example, in your <tt>env.rb</tt>):
   #
@@ -143,6 +68,7 @@ module Webrat
     end
   end
 end
+
 if defined?(ActionController::IntegrationTest)
   module ActionController #:nodoc:
     IntegrationTest.class_eval do

data/lib/webrat.rb

@@ -7,11 +7,11 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.4.2'
+  VERSION = '0.4.4'
 
   def self.require_xml
     gem "nokogiri", ">= 1.0.6"
-    
+
     if on_java?
       # We need Nokogiri's CSS to XPath support, even if using REXML and Hpricot for parsing and searching
       require "nokogiri/css"
@@ -22,11 +22,11 @@ module Webrat
       require "webrat/core/xml/nokogiri"
     end
   end
-  
+
   def self.on_java?
     RUBY_PLATFORM =~ /java/
   end
-  
+
 end
 
 Webrat.require_xml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: diabolo-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Bryan Helmkamp