jwilger-webrat 0.4.3.4 → 0.4.4.2

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
@@ -20,6 +22,7 @@ module Webrat
 
   class SeleniumSession
     include Webrat::SaveAndOpenPage
+    include Webrat::Selenium::SilenceStream
 
     def initialize(*args) # :nodoc:
     end
@@ -31,16 +34,15 @@ module Webrat
       yield
     end
 
-    def visit(url, timeout = nil)
+    def visit(url)
       selenium.open(url)
-      selenium.wait_for_page_to_load(timeout)
     end
 
     webrat_deprecate :visits, :visit
 
     def fill_in(field_identifier, options)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
-      selenium.wait_for_element locator, Webrat.configuration.selenium_server_timeout
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.type(locator, "#{options[:with]}")
     end
 
@@ -54,6 +56,10 @@ module Webrat
       selenium.get_html_source
     end
 
+    def current_url
+      selenium.location
+    end
+
     def click_button(button_text_or_regexp = nil, options = {})
       if button_text_or_regexp.is_a?(Hash) && options == {}
         pattern, options = nil, button_text_or_regexp
@@ -63,7 +69,7 @@ module Webrat
       pattern ||= '*'
       locator = "button=#{pattern}"
 
-      selenium.wait_for_element locator, Webrat.configuration.selenium_server_timeout
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -72,7 +78,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, Webrat.configuration.selenium_server_timeout
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -80,7 +86,7 @@ module Webrat
 
     def click_link_within(selector, link_text, options = {})
       locator = "webratlinkwithin=#{selector}|#{link_text}"
-      selenium.wait_for_element locator, Webrat.configuration.selenium_server_timeout
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -95,7 +101,7 @@ module Webrat
         select_locator = "webratselectwithoption=#{option_text}"
       end
 
-      selenium.wait_for_element select_locator, Webrat.configuration.selenium_server_timeout
+      selenium.wait_for_element select_locator, :timeout_in_seconds => 5
       selenium.select(select_locator, option_text)
     end
 
@@ -103,7 +109,7 @@ module Webrat
 
     def choose(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, Webrat.configuration.selenium_server_timeout
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
 
@@ -111,7 +117,7 @@ module Webrat
 
     def check(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, Webrat.configuration.selenium_server_timeout
+      selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
     alias_method :uncheck, :check
@@ -134,7 +140,7 @@ module Webrat
     end
 
     def wait_for(params={})
-      timeout = params[:timeout] || Webrat.configuration.selenium_server_timeout
+      timeout = params[:timeout] || 5
       message = params[:message] || "Timeout exceeded"
 
       begin_time = Time.now
@@ -180,26 +186,13 @@ module Webrat
     end
 
   protected
-    def silence_stream(stream)
-      old_stream = stream.dup
-      stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
-      stream.sync = true
-      yield
-    ensure
-      stream.reopen(old_stream)
-    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
@@ -211,14 +204,12 @@ 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
+        silence_stream(STDERR) do
+          silence_stream(STDOUT) do
+            $browser.stop
+          end
         end
       end
     end

data/lib/webrat/selenium/silence_stream.rb

@@ -0,0 +1,14 @@
+module Webrat
+  module Selenium
+    module SilenceStream
+      def silence_stream(stream)
+        old_stream = stream.dup
+        stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+        stream.sync = true
+        yield
+      ensure
+        stream.reopen(old_stream)
+      end
+    end
+  end
+end

data/lib/webrat/selenium/sinatra_application_server.rb

@@ -0,0 +1,37 @@
+module Webrat
+  module Selenium
+
+    class SinatraApplicationServer < ApplicationServer
+
+      def start
+        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
+      end
+
+      def stop
+        silence_stream(STDERR) do
+          silence_stream(STDOUT) do
+            pid = File.read(pid_file)
+            system("kill -9 #{pid}")
+            FileUtils.rm_f pid_file
+          end
+        end
+      end
+
+      def fail
+        $stderr.puts
+        $stderr.puts
+        $stderr.puts "==> Failed to boot the Sinatra application server... exiting!"
+        exit
+      end
+
+      def pid_file
+        prepare_pid_file(Dir.pwd, 'rack.pid')
+      end
+
+    end
+
+  end
+end

data/lib/webrat/selenium.rb

@@ -1,90 +1,13 @@
 require "webrat"
-gem "selenium-client", "=1.2.10"
+gem "selenium-client", ">=1.2.14"
 require "selenium/client"
+
+require "webrat/selenium/silence_stream"
 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,
-        Webrat.configuration.selenium_server_startup_timeout)
-      remote_control.jar_file = File.expand_path(__FILE__ + "../../../../vendor/selenium-server.jar")
-      remote_control.additional_args = Webrat.configuration.selenium_server_args
-      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>):
   #
@@ -147,6 +70,7 @@ module Webrat
     end
   end
 end
+
 if defined?(ActionController::IntegrationTest)
   module ActionController #:nodoc:
     IntegrationTest.class_eval do

data/lib/webrat.rb

@@ -7,26 +7,23 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.4.3.4'
+  VERSION = '0.4.4.2'
 
   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"
-      require "hpricot"
-      require "rexml/document"
+      gem "nokogiri", ">= 1.2.4"
     else
-      require "nokogiri"
-      require "webrat/core/xml/nokogiri"
+      gem "nokogiri", ">= 1.0.6"
     end
+
+    require "nokogiri"
+    require "webrat/core/xml/nokogiri"
   end
-  
+
   def self.on_java?
     RUBY_PLATFORM =~ /java/
   end
-  
+
 end
 
 Webrat.require_xml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jwilger-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.3.4
+  version: 0.4.4.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,13 +85,16 @@ files:
 - lib/webrat/core_extensions/detect_mapped.rb
 - lib/webrat/core_extensions/meta_class.rb
 - lib/webrat/core_extensions/nil_to_param.rb
+- lib/webrat/core_extensions/tcp_socket.rb
 - lib/webrat/mechanize.rb
 - lib/webrat/merb.rb
 - lib/webrat/merb_session.rb
 - lib/webrat/rack.rb
+- lib/webrat/rack_test.rb
 - lib/webrat/rails.rb
 - lib/webrat/rspec-rails.rb
 - lib/webrat/selenium
+- lib/webrat/selenium/application_server.rb
 - lib/webrat/selenium/location_strategy_javascript
 - lib/webrat/selenium/location_strategy_javascript/button.js
 - lib/webrat/selenium/location_strategy_javascript/label.js
@@ -105,8 +108,13 @@ files:
 - lib/webrat/selenium/matchers/have_tag.rb
 - lib/webrat/selenium/matchers/have_xpath.rb
 - lib/webrat/selenium/matchers.rb
+- lib/webrat/selenium/merb_application_server.rb
+- lib/webrat/selenium/rails_application_server.rb
 - lib/webrat/selenium/selenium_extensions.js
+- lib/webrat/selenium/selenium_rc_server.rb
 - lib/webrat/selenium/selenium_session.rb
+- lib/webrat/selenium/silence_stream.rb
+- lib/webrat/selenium/sinatra_application_server.rb
 - lib/webrat/selenium.rb
 - lib/webrat/sinatra.rb
 - lib/webrat.rb