dbrady-webrat 0.4.4.1 → 0.4.4.2

data/History.txt

@@ -1,11 +1,46 @@
+== 0.4.5 / ?
+
+* Major enhancements
+
+  * Ruby 1.9 compatibility (Michael Fellinger, Jakub Kuźma)
+  * Improve performance (~2x) on JRuby by supporting Nokogiri
+  * Added support for external app servers in selenium mode (basically don't start one) (Mike Gaffney)
+  * Added support for uploading files for Merb (Ryan Carver)
+
+* Minor enhancements
+
+  * Upgrade to selenium-client to 1.2.16 (Brian Landau)
+  * Upgrade selenium-server.jar to 1.0.1 (Brian Landau)
+  * Make redirect detection work in the face of rational maths (like when ruby-units is active) (Piers Cawley)
+  * Use Launchy to handle opening pages in the browser with cross-platform compatibility (Bryan Helmkamp)
+  * Added support for field_labeled_locators ending in non word characters
+    lh 148 (Zach Dennis)
+  * Filled in tests on click link lh 195 (diabolo)
+  * Added current_url to selenium session lh 215 (Luke Amdor)
+  * Added silence spec to selenium lh 238 (Martin Gamsjaeger aka snusnu)
+  * Added ability to configure the browser startup timeout for selenium lh 242 (Mike Gaffney, Mark Dodwell)
+  * Added delegation for field_named lh194 (pivotal labs)
+  * Added fix to keep from escaping field values in mechanize mode lh256 (jish)
+  * Adding fixes for click button/link and made the integration specs pass for the same in selenium lh254 (Ldiehl, Matthias Marschall)
+  * Adding clicking link by id in selenium mode lh221 (larrytheliquid)
+  * Adding fix for have_selector and have_xpath in descendent blocks lh234 (Thomas Jack)
+  * Adding fix for fields with labels with special characters (Thomas Jack, Mike Gaffney, Bryan Hemlkamp)
+  * Deprecated current_page lh50 (Mike Gaffney)
+  * Fixed issue with redirects and multiple hosts lh168 (Mutwin Kraus)
+
+* Bug fixes
+
+  * Wait for application servers socket on 0.0.0.0 instead of the application_address
+  * Translate CSS and image paths with single quotes in save_and_open_page (Erin Staniland)
+
 == 0.4.4 / 2009-04-06
 
 * Major enhancements
 
   * Make selenium process management code more robust and informative
-  
+
 * Minor enhancements
-  
+
   * Add support for Rails javascript post links (Mark Menard)
   * Upgrade selenium-client dependency to 1.2.14, and update for new waiting
     API (Balint Erdi)
@@ -16,7 +51,7 @@
   * Don't create a new instance of WWW::Mechanize for each request
     (Mark Menard)
   * Select fields with duplicate selected options sent an incorrect value (Noah Davis)
-  
+
 == 0.4.3 / 2009-03-17
 
 * Minor enhancements
@@ -26,7 +61,7 @@
   * Initial Merb and Sinatra compatibility for Selenium mode (Corey Donohoe)
   * When faced with a label with no for attribute, that contains a hidden field
     and another field, as can be the case in Rails 2.3's checkbox view,
-    webrat now locates the non-hidden field. (Luke Melia) 
+    webrat now locates the non-hidden field. (Luke Melia)
   * Add application_framework config for Selenium mode to determine how to
     start and stop the app server (Corey Donohoe)
 
@@ -42,7 +77,7 @@
     attributes in a hash and :count and :content options. See
     have_selector_spec.rb for more.
   * Add the same functionality mentioned above to have_xpath
-    
+
 * Minor enhancements
 
   * Squeeze extra whitespace out of failures messages from contain
@@ -69,7 +104,7 @@
     redirected to (Adam Greene)
   * Recognize input tags with type button (Lena Herrmann)
   * Add uncheck method to Selenium mode (Lee Bankewitz)
-    
+
 * Bug fixes
 
   * Make requests to a Rails app using a full URL instead of a relative path. This change
@@ -80,7 +115,7 @@
     to behave correctly (Noah Davis)
   * Switch to using selenium.click instead of .check when checking a checkbox
     (Noah Davis)
-  * Create tmp/pids directory if directory does not exist. (Amos King and Mike Gaffney)  
+  * Create tmp/pids directory if directory does not exist. (Amos King and Mike Gaffney)
   * Setup deprecated writers for the selenium_environment= and selenium_port= config
   * Ensure the previous pages params aren't passed through redirect (Daniel Lucraft and
     Bryan Helmkamp)
@@ -156,7 +191,7 @@
   * Added save_and_open_screengrab for Selenium mode (Luke Melia)
 
 * Bug fixes
-  
+
   * field_labeled should disregard labels without matching fields (Kyle Hargraves)
   * Fixed bug where Scope was creating a new DOM rather than re-using the existing DOM.
     [#105] (Zach Dennis)

data/README.rdoc

@@ -11,6 +11,18 @@
 Webrat lets you quickly write expressive and robust acceptance tests for a Ruby
 web application. 
 
+== NOTA BENE: About the dbrady fork
+
+This fork includes a patch that fixes Sinatra cookies so cucumber can
+test cookie-based sessions. In all other regards, it is a tracking
+fork of brynary's webrat. Once this patch (which has been pending
+since February 2009, hem-HEM!) has been merged into core Sinatra, I
+will pull down this fork.
+
+Also, adds webrat/rack_test.rb to the gemspec so the file gets
+installed. This is needed if you want your hancock specs to pass.
+(http://github.com/atmos/hancock).
+
 == Features
 
 * Browser Simulator for expressive, high level acceptance testing without the
@@ -82,4 +94,4 @@ methods from Webrat::Session in your specs.
 == License
 
 Copyright (c) 2007-2008 Bryan Helmkamp, Seth Fitzsimmons.
-See MIT-LICENSE.txt in this directory.
+See MIT-LICENSE.txt in this directory.

data/Rakefile

@@ -2,6 +2,7 @@
 require "rake/gempackagetask"
 require 'rake/rdoctask'
 require "rake/clean"
+gem "rspec", "1.2.6"
 require 'spec'
 require 'spec/rake/spectask'
 require 'spec/rake/verify_rcov'
@@ -85,10 +86,47 @@ task :docs => :clobber_docs do
   system "hanna --title 'Webrat #{Webrat::VERSION} API Documentation'"
 end
 
-desc "Run specs using jruby"
-task "spec:jruby" do
+desc "Run everything against multiruby"
+task :multiruby do
+  result = system "multiruby -S rake spec"
+  raise "Multiruby tests failed" unless result
   result = system "jruby -S rake spec"
   raise "JRuby tests failed" unless result
+
+  Dir.chdir "spec/integration/rails" do
+    result = system "multiruby -S rake test_unit:rails"
+    raise "Rails integration tests failed" unless result
+
+    result = system "jruby -S rake test_unit:rails"
+    raise "Rails integration tests failed" unless result
+  end
+
+  Dir.chdir "spec/integration/merb" do
+    result = system "multiruby -S rake spec"
+    raise "Merb integration tests failed" unless result
+
+    result = system "jruby -S rake spec"
+    raise "Rails integration tests failed" unless result
+  end
+
+  Dir.chdir "spec/integration/sinatra" do
+    result = system "multiruby -S rake test"
+    raise "Sinatra integration tests failed" unless result
+
+    result = system "jruby -S rake test"
+    raise "Sinatra integration tests failed" unless result
+  end
+
+  Dir.chdir "spec/integration/rack" do
+    result = system "multiruby -S rake test"
+    raise "Rack integration tests failed" unless result
+
+    result = system "jruby -S rake test"
+    raise "Rack integration tests failed" unless result
+  end
+
+  puts
+  puts "Multiruby OK!"
 end
 
 desc "Run each spec in isolation to test for dependency issues"
@@ -106,7 +144,7 @@ end
 
 namespace :spec do
   desc "Run the integration specs"
-  task :integration => ["integration:rails", "integration:merb", "integration:sinatra"]
+  task :integration => ["integration:rails", "integration:merb", "integration:sinatra", "integration:rack"]
 
   namespace :integration do
     desc "Run the Rails integration specs"
@@ -140,7 +178,15 @@ namespace :spec do
     task :sinatra do
       Dir.chdir "spec/integration/sinatra" do
         result = system "rake test"
-        raise "Sinatra tntegration tests failed" unless result
+        raise "Sinatra integration tests failed" unless result
+      end
+    end
+
+    desc "Run the Sinatra integration specs"
+    task :rack do
+      Dir.chdir "spec/integration/rack" do
+        result = system "rake test"
+        raise "Rack integration tests failed" unless result
       end
     end
   end
@@ -148,8 +194,6 @@ end
 
 task :default => :spec
 
-task :precommit => ["spec", "spec:jruby", "spec:integration"]
-
 desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}

data/lib/webrat.rb

@@ -10,17 +10,14 @@ module Webrat
   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"
-      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?

data/lib/webrat/core/configuration.rb

@@ -54,13 +54,16 @@ module Webrat
     # Set the key that Selenium uses to determine the browser running. Default *firefox
     attr_accessor :selenium_browser_key
 
+    # Set the timeout for waiting for the browser process to start
+    attr_accessor :selenium_browser_startup_timeout
+
     # How many redirects to the same URL should be halted as an infinite redirect
     # loop? Defaults to 10
     attr_accessor :infinite_redirect_limit
 
     def initialize # :nodoc:
       self.open_error_files = true
-      self.parse_with_nokogiri = !Webrat.on_java?
+      self.parse_with_nokogiri = true
       self.application_environment = :test
       self.application_port = 3001
       self.application_address = 'localhost'
@@ -68,6 +71,7 @@ module Webrat
       self.selenium_server_port = 4444
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
+      self.selenium_browser_startup_timeout = 5
     end
 
     def parse_with_nokogiri? #:nodoc:

data/lib/webrat/core/elements/field.rb

@@ -87,6 +87,8 @@ module Webrat
         parse_rails_request_params("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
+      when :mechanize
+        { name => value }
       else
         { name => escaped_value }
       end
@@ -132,7 +134,7 @@ module Webrat
     end
 
     def escaped_value
-      CGI.escape(@value.to_s)
+      CGI.escape([*@value].first.to_s)
     end
 
     def labels
@@ -356,10 +358,16 @@ module Webrat
   protected
 
     def test_uploaded_file
-      if content_type
-        ActionController::TestUploadedFile.new(@value, content_type)
-      else
-        ActionController::TestUploadedFile.new(@value)
+      case Webrat.configuration.mode
+      when :rails
+        if content_type
+          ActionController::TestUploadedFile.new(@value, content_type)
+        else
+          ActionController::TestUploadedFile.new(@value)
+        end
+      when :merb
+        # TODO: support content_type
+        File.new(@value)
       end
     end
 

data/lib/webrat/core/elements/link.rb

@@ -1,5 +1,6 @@
-require "webrat/core_extensions/blank"
+require "English"
 
+require "webrat/core_extensions/blank"
 require "webrat/core/elements/element"
 
 module Webrat

data/lib/webrat/core/locators/field_labeled_locator.rb

@@ -20,7 +20,7 @@ module Webrat
 
       def matching_label_elements
         label_elements.select do |label_element|
-          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}\b/i
+          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
         end
       end
 

data/lib/webrat/core/locators/label_locator.rb

@@ -12,7 +12,7 @@ module Webrat
 
       def label_element
         label_elements.detect do |label_element|
-          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}\b/i
+          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
         end
       end
 

data/lib/webrat/core/locators/link_locator.rb

@@ -45,7 +45,15 @@ module Webrat
       end
 
       def replace_nbsp(str)
-        str.gsub([0xA0].pack('U'), ' ')
+        if str.respond_to?(:valid_encoding?)
+          if str.valid_encoding?
+            str.gsub(/\xc2\xa0/u, ' ')
+          else
+            str.force_encoding('UTF-8').gsub(/\xc2\xa0/u, ' ')
+          end
+        else
+          str.gsub(/\xc2\xa0/u, ' ')
+        end
       end
 
       def replace_nbsp_ref(str)

data/lib/webrat/core/logging.rb

@@ -13,7 +13,10 @@ module Webrat
       when :merb
         Merb.logger
       else
-        nil
+        @logger ||= begin
+          require "logger"
+          ::Logger.new("webrat.log")
+        end
       end
     end
 

data/lib/webrat/core/matchers/have_xpath.rb

@@ -32,7 +32,7 @@ module Webrat
 
       def rexml_matches(stringlike)
         if REXML::Node === stringlike || Array === stringlike
-          @query = query.map { |q| q.gsub(%r'//', './') }
+          @query = query.map { |q| q.gsub(%r'^//', './/') }
         else
           @query = query
         end
@@ -52,7 +52,7 @@ module Webrat
 
       def nokogiri_matches(stringlike)
         if Nokogiri::XML::NodeSet === stringlike
-          @query = query.gsub(%r'//', './')
+          @query = query.gsub(%r'^//', './/')
         else
           @query = query
         end

data/lib/webrat/core/methods.rb

@@ -16,7 +16,11 @@ module Webrat
     end
 
     def webrat_session
-      @_webrat_session ||= ::Webrat.session_class.new(self)
+      if Webrat.configuration.mode == :rack_test
+        @_webrat_session ||= ::Webrat::RackTestSession.new(rack_test_session)
+      else
+        @_webrat_session ||= ::Webrat.session_class.new(self)
+      end
     end
 
     # all of these methods delegate to the @session, which should
@@ -53,9 +57,7 @@ module Webrat
       :field_by_xpath,
       :field_with_id,
       :selenium,
-      :simulate, :automate
-
-
-
+      :simulate, :automate,
+      :field_named
   end
 end

data/lib/webrat/core/save_and_open_page.rb

@@ -18,17 +18,15 @@ module Webrat
     end
 
     def open_in_browser(path) # :nodoc
-      platform = ruby_platform
-      if platform =~ /cygwin/ || platform =~ /win32/
-        `rundll32 url.dll,FileProtocolHandler #{path.gsub("/", "\\\\")}`
-      elsif platform =~ /darwin/
-        `open #{path}`
-      end
+      require "launchy"
+      Launchy::Browser.run(path)
+    rescue LoadError
+      warn "Sorry, you need to install launchy to open pages: `gem install launchy`"
     end
 
     def rewrite_css_and_image_references(response_html) # :nodoc:
       return response_html unless doc_root
-      response_html.gsub(/"\/(stylesheets|images)/, doc_root + '/\1')
+      response_html.gsub(/("|')\/(stylesheets|images)/, '\1' + doc_root + '/\2')
     end
 
     def saved_page_dir #:nodoc:

data/lib/webrat/core/scope.rb

@@ -209,8 +209,8 @@ module Webrat
     # along with the form. An optional <tt>content_type</tt> may be given.
     #
     # Example:
-    #   attaches_file "Resume", "/path/to/the/resume.txt"
-    #   attaches_file "Photo", "/path/to/the/image.png", "image/png"
+    #   attach_file "Resume", "/path/to/the/resume.txt"
+    #   attach_file "Photo", "/path/to/the/image.png", "image/png"
     def attach_file(field_locator, path, content_type = nil)
       locate_field(field_locator, FileField).set(path, content_type)
     end

data/lib/webrat/core/session.rb

@@ -26,6 +26,8 @@ module Webrat
       SinatraSession
     when :mechanize
       MechanizeSession
+    when :rack_test
+      RackTestSession
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -67,6 +69,7 @@ For example:
 
     # For backwards compatibility -- removing in 1.0
     def current_page #:nodoc:
+      warn "current_page is deprecated and will be going away in the next release. Use current_url instead."
       page = OpenStruct.new
       page.url = @current_url
       page.http_method = @http_method
@@ -100,11 +103,8 @@ For example:
       h['HTTP_REFERER'] = @current_url if @current_url
 
       debug_log "REQUESTING PAGE: #{http_method.to_s.upcase} #{url} with #{data.inspect} and HTTP headers #{h.inspect}"
-      if h.empty?
-        send "#{http_method}", url, data || {}
-      else
-        send "#{http_method}", url, data || {}, h
-      end
+
+      process_request(http_method, url, data, h)
 
       save_and_open_page if exception_caught? && Webrat.configuration.open_error_files?
       raise PageLoadError.new("Page load was not successful (Code: #{response_code.inspect}):\n#{formatted_error}") unless success_code?
@@ -144,7 +144,7 @@ For example:
     end
 
     def redirect? #:nodoc:
-      response_code / 100 == 3
+      (response_code / 100).to_i == 3
     end
 
     def internal_redirect?
@@ -256,15 +256,24 @@ For example:
     def_delegators :current_scope, :field_by_xpath
     def_delegators :current_scope, :field_with_id
     def_delegators :current_scope, :select_option
+    def_delegators :current_scope, :field_named
 
   private
 
+    def process_request(http_method, url, data, headers)
+      if headers.empty?
+        send "#{http_method}", url, data || {}
+      else
+        send "#{http_method}", url, data || {}, headers
+      end
+    end
+
     def response_location
       response.headers["Location"]
     end
 
     def current_host
-      URI.parse(current_url).host || "www.example.com"
+      URI.parse(current_url).host || @custom_headers["Host"] || "www.example.com"
     end
 
     def response_location_host

data/lib/webrat/mechanize.rb

@@ -67,7 +67,7 @@ module Webrat #:nodoc:
         else
           current_path.split("/")[0..(-1 - levels_up)].join("/")
         end
-        descendent = url.split("/")[levels_up..-1]
+        descendent = url.split("/")[levels_up..-1].join
         "#{ancestor}/#{descendent}"
       end
   end

data/lib/webrat/merb_session.rb

@@ -1,16 +1,15 @@
 require "webrat"
-
-require "cgi"
-gem "extlib"
-require "extlib"
 require "merb-core"
-
-# HashWithIndifferentAccess = Mash
+require "webrat/merb_multipart_support"
 
 module Webrat
   class MerbSession < Session #:nodoc:
     include Merb::Test::MakeRequest
 
+    # Include Webrat's own version of multipart_post/put because the officially
+    # supported methods in Merb don't perform the request correctly.
+    include MerbMultipartSupport
+
     attr_accessor :response
 
     def get(url, data, headers = nil)
@@ -38,12 +37,34 @@ module Webrat
     end
 
     def do_request(url, data, headers, method)
-      @response = request(url,
-        :params => (data && data.any?) ? data : nil,
-        :headers => headers,
-        :method => method)
+      if method == "POST" && has_file?(data)
+        @response = multipart_post(url, data, :headers => headers)
+
+      elsif method == "PUT" && has_file?(data)
+        @response = multipart_put(url, data, :headers => headers)
+
+      else
+        @response = request(url,
+          :params => (data && data.any?) ? data : nil,
+          :headers => headers,
+          :method => method)
+      end
     end
 
+    protected
+
+      # Recursively search the data for a file attachment.
+      def has_file?(data)
+        data.each do |key, value|
+          if value.is_a?(Hash)
+            return has_file?(value)
+          else
+            return true if value.is_a?(File)
+          end
+        end
+        return false
+      end
+
   end
 end
 
@@ -57,9 +78,3 @@ module Merb #:nodoc:
     end
   end
 end
-
-class Merb::Test::RspecStory #:nodoc:
-  def browser
-    @browser ||= Webrat::MerbSession.new
-  end
-end

data/lib/webrat/rack_test.rb

@@ -0,0 +1,32 @@
+module Webrat
+  class RackTestSession < Session
+
+    def initialize(rack_test_session) #:nodoc:
+      super()
+      @rack_test_session = rack_test_session
+    end
+
+    def response_body
+      response.body
+    end
+
+    def response_code
+      response.status
+    end
+
+    def response
+      @rack_test_session.last_response
+    end
+
+  protected
+
+    def process_request(http_method, url, data = {}, headers = {})
+      headers ||= {}
+      data    ||= {}
+
+      env = headers.merge(:params => data, :method => http_method.to_s.upcase)
+      @rack_test_session.request(url, env)
+    end
+
+  end
+end

data/lib/webrat/rspec-rails.rb

@@ -6,8 +6,5 @@
 require "webrat/core/matchers"
 
 Spec::Runner.configure do |config|
-  # rspec should support :type => [:controller, :helper, :view] - but until it does ...
-  config.include(Webrat::Matchers, :type => :controller)
-  config.include(Webrat::Matchers, :type => :helper)
-  config.include(Webrat::Matchers, :type => :view)
+  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
 end

data/lib/webrat/selenium.rb

@@ -1,6 +1,7 @@
 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"
 require "webrat/selenium/matchers"
 require "webrat/core_extensions/tcp_socket"

data/lib/webrat/selenium/location_strategy_javascript/button.js

@@ -1,12 +1,19 @@
 if (locator == '*') {
   return selenium.browserbot.locationStrategies['xpath'].call(this, "//input[@type='submit']", inDocument, inWindow)
 }
+var buttons = inDocument.getElementsByTagName('button');
 var inputs = inDocument.getElementsByTagName('input');
-return $A(inputs).find(function(candidate){
-  inputType = candidate.getAttribute('type');
-  if (inputType == 'submit' || inputType == 'image') {
-    var buttonText = $F(candidate);
-    return (PatternMatcher.matches(locator, buttonText));
-  }
-  return false;
+var result = $A(inputs).concat($A(buttons)).find(function(candidate){
+	var type = candidate.getAttribute('type');
+	if (type == 'submit' || type == 'image'  || type == 'button') {
+		var matches_id = PatternMatcher.matches(locator, candidate.id);
+		var matches_value = PatternMatcher.matches(locator, candidate.value);
+		var matches_html = PatternMatcher.matches(locator, candidate.innerHTML);
+		var matches_alt = PatternMatcher.matches(locator, candidate.alt);
+		if (matches_id || matches_value || matches_html || matches_alt) {
+			return true;
+		}
+	}
+	return false;
 });
+return result;

data/lib/webrat/selenium/location_strategy_javascript/webratlink.js

@@ -1,6 +1,9 @@
 var links = inDocument.getElementsByTagName('a');
 var candidateLinks = $A(links).select(function(candidateLink) {
-  return PatternMatcher.matches(locator, getText(candidateLink));
+  var textMatched = PatternMatcher.matches(locator, getText(candidateLink));
+  var idMatched = PatternMatcher.matches(locator, candidateLink.id);
+  var titleMatched = PatternMatcher.matches(locator, candidateLink.title);
+  return textMatched || idMatched || titleMatched;
 });
 if (candidateLinks.length == 0) {
   return null;

data/lib/webrat/selenium/selenium_session.rb

@@ -1,6 +1,7 @@
 require "webrat/core/save_and_open_page"
 require "webrat/selenium/selenium_rc_server"
-require "webrat/selenium/application_server"
+require "webrat/selenium/application_server_factory"
+require "webrat/selenium/application_servers/base"
 
 module Webrat
   class TimeoutError < WebratError
@@ -22,6 +23,7 @@ module Webrat
 
   class SeleniumSession
     include Webrat::SaveAndOpenPage
+    include Webrat::Selenium::SilenceStream
 
     def initialize(*args) # :nodoc:
     end
@@ -40,7 +42,7 @@ module Webrat
     webrat_deprecate :visits, :visit
 
     def fill_in(field_identifier, options)
-      locator = "webrat=#{Regexp.escape(field_identifier)}"
+      locator = "webrat=#{field_identifier}"
       selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.type(locator, "#{options[:with]}")
     end
@@ -55,6 +57,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
@@ -145,8 +151,10 @@ module Webrat
 
         begin
           value = yield
-        rescue ::Spec::Expectations::ExpectationNotMetError, ::Selenium::CommandError, Webrat::WebratError
-          value = nil
+        rescue Exception => e
+          unless is_ignorable_wait_for_exception?(e)
+            raise e
+          end
         end
 
         return value if value
@@ -177,23 +185,22 @@ module Webrat
       else
         $browser.capture_screenshot(filename)
       end
-        open_in_browser(filename)
-    end
+      open_in_browser(filename)
 
-  protected
+    end
 
-    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)
+    protected
+    def is_ignorable_wait_for_exception?(exception) #:nodoc:
+      if defined?(::Spec::Expectations::ExpectationNotMetError)
+        return true if exception.class == ::Spec::Expectations::ExpectationNotMetError
+      end
+      return true if [::Selenium::CommandError, Webrat::WebratError].include?(exception.class)
+      return false
     end
 
     def setup #:nodoc:
       Webrat::Selenium::SeleniumRCServer.boot
-      Webrat::Selenium::ApplicationServer.boot
+      Webrat::Selenium::ApplicationServerFactory.app_server_instance.boot
 
       create_browser
       $browser.start
@@ -206,7 +213,7 @@ module Webrat
 
     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}")
+      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
 
       at_exit do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbrady-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.4.1
+  version: 0.4.4.2
 platform: ruby
 authors: 
 - David Brady
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 21:13:10.126173 -07:00
+date: 2009-07-17 10:31:47.766398 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,7 @@ files:
 - lib/webrat/rack.rb
 - lib/webrat/rails.rb
 - lib/webrat/rspec-rails.rb
+- lib/webrat/rack_test.rb
 - lib/webrat/selenium
 - lib/webrat/selenium/location_strategy_javascript
 - lib/webrat/selenium/location_strategy_javascript/button.js