brynary-webrat 0.3.2.1 → 0.3.2.2

data/History.txt

@@ -1,17 +1,26 @@
-== Trunk
+== Trunk (Git)
 
-  TODO: Document changes to Webrat requiring. See:
+* _IMPORTANT_ Breaking change:
+
+  * Removed init.rb auto-require of webrat/rails
+  * Removed auto-require of webrat/rails when requiring webrat when RAILS_ENV is
+    defined
+  
+  In your env.rb file, ensure you have:
   
-    54de30032e7a6be5ef0321a3fcab318029dad0f8
-    ad8956070788cf3fa0f2ea5cbcb33867028c8605
+    require "webrat/rails"
   
 * Major enhancements
 
-  * Use Hpricot and REXML when not parsing with Nokogiri (on JRuby, for example)
   * Added select_time, select_date, and select_datetime to API. [#36] (Ben Mabey)
+  * Use Hpricot and REXML when not parsing with Nokogiri (on JRuby, for example)
 
 * Minor enhancements
 
+  * Better inspect output for Webrat elements
+  * Detect if the document is XML or HTML using the Content-Type when in Rails mode
+  * Expose #selenium method for direct access to Selenium client
+  * Check nokogiri gem version before requiring nokogiri
   * Include the Selenium server jar file in the gem (Bryan Helmkamp, Ben Schwarz)
   * Added key_down, key_up and fire_event to Selenium session (Fernando Garcia)
   * Fix outputing README during Rails plugin install (Fernando Garcia)

data/README.rdoc

@@ -16,7 +16,7 @@ web application.
 * Browser Simulator for expressive, high level acceptance testing without the
   performance hit and browser dependency of Selenium or Watir (See Webrat::Session)
 * Use the same API for Browser Simulator and real Selenium tests using
-  Webrat::SeleniumSession when necessary (eg. for testing AJAX interactions)
+  Webrat::Selenium when necessary (eg. for testing AJAX interactions)
 * Supports multiple Ruby web frameworks: Rails, Merb and Sinatra
 * Supports popular test frameworks: RSpec, Cucumber, Test::Unit and Shoulda
 * Webrat::Matchers API for verifying rendered HTML using CSS, XPath, etc.

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

@@ -24,6 +24,10 @@ module Webrat
       Webrat::XML.xpath_to(@element)
     end
     
+    def inspect
+      "#<#{self.class} @element=#{element.inspect}>"
+    end
+    
   end
   
 end

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

@@ -138,7 +138,7 @@ module Webrat
       end
     
       unless id.blank?
-        @label_elements += Webrat::XML.css_search(form.element, "label[@for='#{id}']")
+        @label_elements += Webrat::XML.xpath_search(form.element, ".//label[@for = '#{id}']")
       end
     
       @label_elements
@@ -373,8 +373,8 @@ module Webrat
   protected
 
     def default_value
-      selected_options = Webrat::XML.css_search(@element, "option[@selected='selected']")
-      selected_options = Webrat::XML.css_search(@element, "option:first") if selected_options.empty? 
+      selected_options = Webrat::XML.xpath_search(@element, ".//option[@selected = 'selected']")
+      selected_options = Webrat::XML.xpath_search(@element, ".//option[position() = 1]") if selected_options.empty? 
       
       selected_options.map do |option|
         return "" if option.nil?

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

@@ -9,10 +9,6 @@ module Webrat
       ".//a[@href]"
     end
     
-    def self.css_search
-      "a[@href]"
-    end
-    
     def click(options = {})
       method = options[:method] || http_method
       return if href =~ /^#/ && method == :get

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

@@ -41,7 +41,7 @@ module Webrat
       end
   
       def link_elements
-        Webrat::XML.css_search(@dom, *Link.css_search)
+        Webrat::XML.xpath_search(@dom, *Link.xpath_search)
       end
   
       def replace_nbsp(str)

data/lib/webrat/core/methods.rb

@@ -7,14 +7,18 @@ module Webrat
           def #{meth}(*args, &blk)
             webrat_session.#{meth}(*args, &blk)
           end
-          
-          def webrat_session
-            @_webrat_session ||= ::Webrat.session_class.new(self)
-          end
         RUBY
       end
     end
     
+    def webrat
+      webrat_session
+    end
+    
+    def webrat_session
+      @_webrat_session ||= ::Webrat.session_class.new(self)
+    end
+    
     # all of these methods delegate to the @session, which should
     # be created transparently.
     #
@@ -45,9 +49,11 @@ module Webrat
       :request_page, :current_dom,
       :selects_date, :selects_time, :selects_datetime,
       :select_date, :select_time, :select_datetime,
-      :wait_for_page_to_load,
       :field_by_xpath,
-      :field_with_id
+      :field_with_id,
+      :selenium,
+      :simulate, :automate
+      
       
     
   end

data/lib/webrat/core/save_and_open_page.rb

@@ -0,0 +1,50 @@
+module Webrat
+  module SaveAndOpenPage
+    # Saves the page out to RAILS_ROOT/tmp/ and opens it in the default
+    # web browser if on OS X. Useful for debugging.
+    # 
+    # Example:
+    #   save_and_open_page
+    def save_and_open_page
+      return unless File.exist?(saved_page_dir)
+
+      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.html"
+      
+      File.open(filename, "w") do |f|
+        f.write rewrite_css_and_image_references(response_body)
+      end
+
+      open_in_browser(filename)
+    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
+    end
+    
+    def rewrite_css_and_image_references(response_html) # :nodoc:
+      return response_html unless doc_root
+      response_html.gsub(/"\/(stylesheets|images)/, doc_root + '/\1')
+    end
+    
+    def saved_page_dir #:nodoc:
+      File.expand_path(".")
+    end
+    
+    def doc_root #:nodoc:
+      nil
+    end
+  
+  private
+
+    # accessor for testing
+    def ruby_platform
+      RUBY_PLATFORM
+    end
+    
+  end
+end

data/lib/webrat/core/scope.rb

@@ -279,13 +279,25 @@ module Webrat
     
     def page_dom #:nodoc:
       return @response.dom if @response.respond_to?(:dom)
-      dom = Webrat::XML.document(@response_body)
+      
+      if @session.xml_content_type?
+        dom = Webrat::XML.xml_document(@response_body)
+      else
+        dom = Webrat::XML.html_document(@response_body)
+      end
+      
       Webrat.define_dom_method(@response, dom)
       return dom
     end
     
     def scoped_dom #:nodoc:
-      Webrat::XML.document("<html>" + Webrat::XML.to_html(Webrat::XML.css_search(@scope.dom, @selector).first) + "</html>")
+      source = Webrat::XML.to_html(Webrat::XML.css_search(@scope.dom, @selector).first)
+      
+      if @session.xml_content_type?
+        Webrat::XML.xml_document(source)
+      else
+        Webrat::XML.html_document(source)
+      end
     end
     
     def locate_field(field_locator, *field_types) #:nodoc:

data/lib/webrat/core/session.rb

@@ -2,6 +2,7 @@ require "forwardable"
 require "ostruct"
 
 require "webrat/core/mime"
+require "webrat/core/save_and_open_page"
 
 module Webrat
   # A page load or form submission returned an unsuccessful response code (500-599)
@@ -30,6 +31,7 @@ module Webrat
   class Session
     extend Forwardable
     include Logging
+    include SaveAndOpenPage
     
     attr_reader :current_url
     attr_reader :elements
@@ -43,23 +45,6 @@ module Webrat
       
       reset
     end
-
-    # Saves the page out to RAILS_ROOT/tmp/ and opens it in the default
-    # web browser if on OS X. Useful for debugging.
-    # 
-    # Example:
-    #   save_and_open_page
-    def save_and_open_page
-      return unless File.exist?(saved_page_dir)
-
-      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.html"
-      
-      File.open(filename, "w") do |f|
-        f.write rewrite_css_and_image_references(response_body)
-      end
-
-      open_in_browser(filename)
-    end
     
     def current_dom #:nodoc:
       current_scope.dom
@@ -78,10 +63,6 @@ module Webrat
       nil
     end
     
-    def saved_page_dir #:nodoc:
-      File.expand_path(".")
-    end
-
     def header(key, value)
       @custom_headers[key] = value
     end
@@ -172,20 +153,6 @@ module Webrat
     end
     
     webrat_deprecate :visits, :visit
-    
-    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
-    end
-    
-    def rewrite_css_and_image_references(response_html) # :nodoc:
-      return response_html unless doc_root
-      response_html.gsub(/"\/(stylesheets|images)/, doc_root + '/\1')
-    end
 
     # Subclasses can override this to show error messages without html
     def formatted_error #:nodoc:
@@ -204,6 +171,20 @@ module Webrat
       page_scope.dom
     end
     
+    def xml_content_type?
+      false
+    end
+    
+    def simulate
+      return if Webrat.configuration.mode == :selenium
+      yield
+    end
+    
+    def automate
+      return unless Webrat.configuration.mode == :selenium
+      yield
+    end
+    
     def_delegators :current_scope, :fill_in,            :fills_in
     def_delegators :current_scope, :set_hidden_field
     def_delegators :current_scope, :submit_form
@@ -233,9 +214,5 @@ module Webrat
       @_page_scope  = nil
     end
     
-    # accessor for testing
-    def ruby_platform
-      RUBY_PLATFORM
-    end
   end
 end

data/lib/webrat/core/xml/nokogiri.rb

@@ -18,6 +18,38 @@ module Webrat
     end
   end
   
+  def self.html_nokogiri_document(stringlike) #:nodoc:
+    return stringlike.dom if stringlike.respond_to?(:dom)
+    
+    if Nokogiri::HTML::Document === stringlike
+      stringlike
+    elsif Nokogiri::XML::NodeSet === stringlike
+      stringlike
+    elsif StringIO === stringlike
+      Nokogiri::HTML(stringlike.string)
+    elsif stringlike.respond_to?(:body)
+      Nokogiri::HTML(stringlike.body.to_s)
+    else
+      Nokogiri::HTML(stringlike.to_s)
+    end
+  end
+  
+  def self.xml_nokogiri_document(stringlike) #:nodoc:
+    return stringlike.dom if stringlike.respond_to?(:dom)
+    
+    if Nokogiri::HTML::Document === stringlike
+      stringlike
+    elsif Nokogiri::XML::NodeSet === stringlike
+      stringlike
+    elsif StringIO === stringlike
+      Nokogiri::XML(stringlike.string)
+    elsif stringlike.respond_to?(:body)
+      Nokogiri::XML(stringlike.body.to_s)
+    else
+      Nokogiri::XML(stringlike.to_s)
+    end
+  end
+  
   def self.define_dom_method(object, dom) #:nodoc:
     object.meta_class.send(:define_method, :dom) do
       dom

data/lib/webrat/core/xml.rb

@@ -12,6 +12,22 @@ module Webrat #:nodoc:
         Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
+    
+    def self.html_document(stringlike) #:nodoc:
+      if Webrat.configuration.parse_with_nokogiri?
+        Webrat.html_nokogiri_document(stringlike)
+      else
+        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+      end
+    end
+    
+    def self.xml_document(stringlike) #:nodoc:
+      if Webrat.configuration.parse_with_nokogiri?
+        Webrat.xml_nokogiri_document(stringlike)
+      else
+        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+      end
+    end
 
     def self.to_html(element)
       if Webrat.configuration.parse_with_nokogiri?

data/lib/webrat/core.rb

@@ -11,3 +11,4 @@ require "webrat/core/elements/select_option"
 require "webrat/core/session"
 require "webrat/core/methods"
 require "webrat/core/matchers"
+require "webrat/core/save_and_open_page"

data/lib/webrat/rails.rb

@@ -36,6 +36,10 @@ module Webrat
       response.code.to_i
     end
     
+    def xml_content_type?
+      response.headers["Content-Type"].to_s =~ /xml/
+    end
+    
   protected
     
     def integration_session
@@ -44,15 +48,18 @@ module Webrat
     
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
-      integration_session.request_via_redirect(http_method, remove_protocol(url), data, headers)
+      url = normalize_url(url)
+      integration_session.request_via_redirect(http_method, url, data, headers)
     end
   
-    def remove_protocol(href) #:nodoc:
-      if href =~ %r{^https?://www.example.com(/.*)}
-        $LAST_MATCH_INFO.captures.first
-      else
-        href
+    # remove protocol, host and anchor
+    def normalize_url(href) #:nodoc:
+      uri = URI.parse(href)
+      normalized_url = uri.path
+      if uri.query
+        normalized_url += "?" + uri.query
       end
+      normalized_url
     end
     
     def update_protocol(href) #:nodoc:
@@ -82,6 +89,7 @@ module ActionController #:nodoc:
   
   IntegrationTest.class_eval do
     include Webrat::Methods
+    include Webrat::Matchers
   end
 end
 

data/lib/webrat/rspec-rails.rb

@@ -1,5 +1,5 @@
 # Supports using the matchers in controller, helper, and view specs if you're
-# using rspec-rails. Just add a require statement to spec/spec_helper.rb:
+# using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
 # 
 #   require 'webrat/rspec-rails'
 #

data/lib/webrat/selenium/matchers.rb

@@ -0,0 +1,108 @@
+module Webrat
+  module Selenium
+    module Matchers
+
+      class HaveXpath
+        def initialize(expected)
+          @expected = expected
+        end
+        
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("xpath=#{@expected}")
+          end
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match xpath #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match xpath #{@expected}:\n#{@document}"
+        end
+      end
+      
+      def have_xpath(xpath)
+        HaveXpath.new(xpath)
+      end
+      
+      class HaveSelector
+        def initialize(expected)
+          @expected = expected
+        end
+        
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("css=#{@expected}")
+          end
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match selector #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match selector #{@expected}:\n#{@document}"
+        end
+      end
+      
+      def have_selector(content)
+        HaveSelector.new(content)
+      end
+      
+      class HasContent #:nodoc:
+        def initialize(content)
+          @content = content
+        end
+        
+        def matches?(response)
+          if @content.is_a?(Regexp)
+            text_finder = "regexp:#{@content.source}"
+          else
+            text_finder = @content
+          end
+          
+          response.session.wait_for do
+            response.selenium.is_text_present(text_finder)
+          end
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected the following element's content to #{content_message}:\n#{@element}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected the following element's content to not #{content_message}:\n#{@element}"
+        end
+
+        def content_message
+          case @content
+          when String
+            "include \"#{@content}\""
+          when Regexp
+            "match #{@content.inspect}"
+          end
+        end
+      end
+
+      # Matches the contents of an HTML document with
+      # whatever string is supplied
+      def contain(content)
+        HasContent.new(content)
+      end
+      
+    end
+  end
+end

data/lib/webrat/selenium/selenium_session.rb

@@ -1,9 +1,34 @@
+require "webrat/core/save_and_open_page"
+
 module Webrat
+  class TimeoutError < WebratError
+  end
+  
+  class SeleniumResponse
+    attr_reader :body
+    attr_reader :session
+    
+    def initialize(session, body)
+      @session = session
+      @body = body
+    end
+    
+    def selenium
+      session.selenium
+    end
+  end
+  
   class SeleniumSession
+    include Webrat::SaveAndOpenPage
     
     def initialize(*args) # :nodoc:
-      extend_selenium
-      define_location_strategies
+    end
+    
+    def simulate
+    end
+    
+    def automate
+      yield
     end
     
     def visit(url)
@@ -14,11 +39,16 @@ module Webrat
     
     def fill_in(field_identifier, options)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
+      selenium.wait_for_element locator, 5
       selenium.type(locator, "#{options[:with]}")
     end
     
     webrat_deprecate :fills_in, :fill_in
     
+    def response
+      SeleniumResponse.new(self, response_body)
+    end
+    
     def response_body #:nodoc:
       selenium.get_html_source
     end
@@ -26,57 +56,34 @@ module Webrat
     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
-      else
+      elsif button_text_or_regexp
         pattern = adjust_if_regexp(button_text_or_regexp)
       end
       pattern ||= '*'
-      selenium.click("button=#{pattern}")
-      wait_for_result(options[:wait])
+      locator = "button=#{pattern}"
+      
+      selenium.wait_for_element locator, 5
+      selenium.click locator
     end
     
     webrat_deprecate :clicks_button, :click_button
 
     def click_link(link_text_or_regexp, options = {})
       pattern = adjust_if_regexp(link_text_or_regexp)
-      selenium.click("webratlink=#{pattern}")
-      wait_for_result(options[:wait])
+      locator = "webratlink=#{pattern}"
+      selenium.wait_for_element locator, 5
+      selenium.click locator
     end
     
     webrat_deprecate :clicks_link, :click_link
     
     def click_link_within(selector, link_text, options = {})
-      selenium.click("webratlinkwithin=#{selector}|#{link_text}")
-      wait_for_result(options[:wait])
+      locator = "webratlinkwithin=#{selector}|#{link_text}"
+      selenium.wait_for_element locator, 5
+      selenium.click locator
     end
     
     webrat_deprecate :clicks_link_within, :click_link_within
-
-    def wait_for_result(wait_type)
-      if wait_type == :ajax
-        wait_for_ajax
-      elsif wait_type == :effects
-        wait_for_effects
-      else
-        wait_for_page_to_load
-      end
-    end
-
-    def wait_for_page_to_load(timeout = 15000)
-      selenium.wait_for_page_to_load(timeout)
-    end
-
-    def wait_for_ajax(timeout = 15000)
-      selenium.wait_for_condition "Ajax.activeRequestCount == 0", timeout
-    end
-
-    def wait_for_effects(timeout = 15000)
-      selenium.wait_for_condition "window.Effect.Queue.size() == 0", timeout
-    end
-
-    def wait_for_ajax_and_effects
-      wait_for_ajax
-      wait_for_effects
-    end    
     
     def select(option_text, options = {})
       id_or_name_or_label = options[:from]
@@ -86,30 +93,28 @@ module Webrat
       else
         select_locator = "webratselectwithoption=#{option_text}"
       end
+      
+      selenium.wait_for_element select_locator, 5
       selenium.select(select_locator, option_text)
     end
     
     webrat_deprecate :selects, :select
     
     def choose(label_text)
-      selenium.click("webrat=#{label_text}")
+      locator = "webrat=#{label_text}"
+      selenium.wait_for_element locator, 5
+      selenium.click locator
     end
     
     webrat_deprecate :chooses, :choose
         
     def check(label_text)
-      selenium.check("webrat=#{label_text}")
+      locator = "webrat=#{label_text}"
+      selenium.wait_for_element locator, 5
+      selenium.check locator
     end
     
     webrat_deprecate :checks, :check
-    
-    def is_ordered(*args) #:nodoc:
-      selenium.is_ordered(*args)
-    end
-    
-    def dragdrop(*args) #:nodoc:
-      selenium.dragdrop(*args)
-    end
 
     def fire_event(field_identifier, event)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
@@ -126,12 +131,52 @@ module Webrat
       selenium.key_up(locator, key_code)
     end
     
-    def browser
+    def wait_for(params={})
+      timeout = params[:timeout] || 5
+      message = params[:message] || "Timeout exceeded"
+
+      begin_time = Time.now
+
+      while (Time.now - begin_time) < timeout
+        value = nil
+
+        begin
+          value = yield
+        rescue ::Spec::Expectations::ExpectationNotMetError, ::Selenium::CommandError, Webrat::WebratError
+          value = nil
+        end
+
+        return value if value
+
+        sleep 0.25
+      end
+
+      raise Webrat::TimeoutError.new(message + " (after #{timeout} sec)")
+      true
+    end
+    
+    def selenium
       return $browser if $browser
       setup
       $browser
     end
     
+    webrat_deprecate :browser, :selenium
+    
+    
+    def save_and_open_screengrab
+      return unless File.exist?(saved_page_dir)
+      
+      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.png"
+         
+      if $browser.chrome_backend?
+        $browser.capture_entire_page_screenshot(filename, '')
+      else
+        $browser.capture_screenshot(filename)
+      end
+        open_in_browser(filename)
+    end
+    
   protected
     
     def setup #:nodoc:
@@ -140,15 +185,14 @@ module Webrat
         Webrat.start_app_server
       end
       
-      
       $browser = ::Selenium::Client::Driver.new("localhost", 4444, "*firefox", "http://0.0.0.0:3001")
       $browser.set_speed(0)
       $browser.start
       teardown_at_exit
-    end
-    
-    def selenium #:nodoc:
-      browser
+      
+      extend_selenium
+      define_location_strategies
+      $browser.window_maximize
     end
     
     def teardown_at_exit #:nodoc:
@@ -165,7 +209,7 @@ module Webrat
       if text_or_regexp.is_a?(Regexp)
         "evalregex:#{text_or_regexp.inspect}"
       else
-        text_or_regexp
+        "evalregex:/#{text_or_regexp}/"
       end 
     end
     

data/lib/webrat/selenium.rb

@@ -2,6 +2,7 @@ require "webrat"
 gem "selenium-client", ">=1.2.9"
 require "selenium/client"
 require "webrat/selenium/selenium_session"
+require "webrat/selenium/matchers"
 
 Webrat.configuration.mode = :selenium
 
@@ -36,24 +37,71 @@ module Webrat
     system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
   end
   
-  module Selenium #:nodoc:
+  # 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>):
+  #
+  #   require "webrat/selenium"
+  # 
+  # Then, if you're using Cucumber, configure it to use a 
+  # <tt>Webrat::Selenium::Rails::World</tt> as the scenario context by adding
+  # the following to <tt>env.rb</tt>:
+  #
+  #   World do
+  #     Webrat::Selenium::Rails::World.new
+  #   end
+  #
+  # == Dropping down to the selenium-client API
+  #
+  # If you ever need to do something with Selenium not provided in the Webrat API,
+  # you can always drop down to the selenium-client API using the <tt>selenium</tt> method.
+  # For example:
+  #
+  #   When "I drag the photo to the left" do
+  #     selenium.dragdrop("id=photo_123", "+350, 0")
+  #   end
+  #
+  # == Auto-starting of the mongrel and java server
+  #
+  # Webrat will automatically start the Selenium Java server process and an instance
+  # of Mongrel when a test is run. The Mongrel will run in the "selenium" environment
+  # instead of "test", so ensure you've got that defined, and will run on port 3001.
+  #
+  # == Waiting
+  #
+  # In order to make writing Selenium tests as easy as possible, Webrat will automatically
+  # wait for the correct elements to exist on the page when trying to manipulate them
+  # with methods like <tt>fill_in</tt>, etc. In general, this means you should be able to write
+  # your Webrat::Selenium tests ignoring the concurrency issues that can plague in-browser
+  # testing, so long as you're using the Webrat API.
+  module Selenium
+    
     module Rails #:nodoc:
       class World < ::ActionController::IntegrationTest
+        include Webrat::Selenium::Matchers
         
         def initialize #:nodoc:
           @_result = Test::Unit::TestResult.new
         end
         
+        def response
+          webrat_session.response
+        end
+        
+        def wait_for(*args, &block)
+          webrat_session.wait_for(*args, &block)
+        end
+
+        def save_and_open_screengrab
+          webrat_session.save_and_open_screengrab
+        end
       end
     end
   end
     
 end
 
-module ::ActionController #:nodoc:
-  module Integration #:nodoc:
-    class Session #:nodoc:
-      include Webrat::Methods
-    end
+module ActionController #:nodoc:
+  IntegrationTest.class_eval do
+    include Webrat::Methods
   end
-end
+end

data/lib/webrat.rb

@@ -7,9 +7,11 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.3.2.1'
+  VERSION = '0.3.2.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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brynary-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.1
+  version: 0.3.2.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 -08:00
+date: 2008-12-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - lib/webrat/core/matchers.rb
 - lib/webrat/core/methods.rb
 - lib/webrat/core/mime.rb
+- lib/webrat/core/save_and_open_page.rb
 - lib/webrat/core/scope.rb
 - lib/webrat/core/session.rb
 - lib/webrat/core/xml
@@ -99,6 +100,7 @@ files:
 - lib/webrat/selenium/location_strategy_javascript/webratlink.js
 - lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js
 - lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js
+- lib/webrat/selenium/matchers.rb
 - lib/webrat/selenium/selenium_extensions.js
 - lib/webrat/selenium/selenium_session.rb
 - lib/webrat/selenium.rb