jwilger-webrat 0.4.3.4 → 0.4.4.2

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

@@ -1,20 +1,20 @@
 module Webrat
   module Matchers
-  
+
     class HasContent #:nodoc:
       def initialize(content)
         @content = content
       end
-      
+
       def matches?(stringlike)
         if Webrat.configuration.parse_with_nokogiri?
           @document = Webrat.nokogiri_document(stringlike)
         else
           @document = Webrat.hpricot_document(stringlike)
         end
-        
+
         @element = Webrat::XML.inner_text(@document)
-      
+
         case @content
         when String
           @element.include?(@content)
@@ -22,7 +22,7 @@ module Webrat
           @element.match(@content)
         end
       end
-      
+
       # ==== Returns
       # String:: The failure message.
       def failure_message
@@ -34,11 +34,11 @@ module Webrat
       def negative_failure_message
         "expected the following element's content to not #{content_message}:\n#{squeeze_space(@element)}"
       end
-      
+
       def squeeze_space(inner_text)
         inner_text.gsub(/^\s*$/, "").squeeze("\n")
       end
-      
+
       def content_message
         case @content
         when String
@@ -48,26 +48,26 @@ module Webrat
         end
       end
     end
-    
+
     # Matches the contents of an HTML document with
     # whatever string is supplied
     def contain(content)
       HasContent.new(content)
     end
-    
+
     # Asserts that the body of the response contain
     # the supplied string or regexp
     def assert_contain(content)
       hc = HasContent.new(content)
       assert hc.matches?(response_body), hc.failure_message
     end
-    
+
     # Asserts that the body of the response
     # does not contain the supplied string or regepx
     def assert_not_contain(content)
       hc = HasContent.new(content)
       assert !hc.matches?(response_body), hc.negative_failure_message
     end
-    
+
   end
-end
+end

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

@@ -2,7 +2,7 @@ require "webrat/core/matchers/have_xpath"
 
 module Webrat
   module Matchers
-    
+
     class HaveSelector < HaveXpath #:nodoc:
       # ==== Returns
       # String:: The failure message.
@@ -15,7 +15,7 @@ module Webrat
       def negative_failure_message
         "expected following output to omit a #{tag_inspect}:\n#{@document}"
       end
-      
+
       def tag_inspect
         options = @options.dup
         count = options.delete(:count)
@@ -40,9 +40,9 @@ module Webrat
           ast.to_xpath
         end.first
       end
-      
+
     end
-    
+
     # Matches HTML content against a CSS 3 selector.
     #
     # ==== Parameters
@@ -54,21 +54,21 @@ module Webrat
       HaveSelector.new(name, attributes, &block)
     end
     alias_method :match_selector, :have_selector
-    
-    
+
+
     # Asserts that the body of the response contains
     # the supplied selector
     def assert_have_selector(name, attributes = {}, &block)
       matcher = HaveSelector.new(name, attributes, &block)
       assert matcher.matches?(response_body), matcher.failure_message
     end
-    
+
     # Asserts that the body of the response
     # does not contain the supplied string or regepx
     def assert_have_no_selector(name, attributes = {}, &block)
       matcher = HaveSelector.new(name, attributes, &block)
       assert !matcher.matches?(response_body), matcher.negative_failure_message
     end
-    
+
   end
-end
+end

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

@@ -6,16 +6,16 @@ module Webrat
     def have_tag(*args, &block)
       have_selector(*args, &block)
     end
-    
+
     alias_method :match_tag, :have_tag
-    
+
     def assert_have_tag(*args, &block)
       assert_have_selector(*args, &block)
     end
-    
+
     def assert_have_no_tag(*args, &block)
       assert_have_no_selector(*args, &block)
     end
 
   end
-end
+end

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

@@ -3,25 +3,25 @@ require "webrat/core/xml/rexml"
 
 module Webrat
   module Matchers
-    
+
     class HaveXpath #:nodoc:
       def initialize(expected, options = {}, &block)
         @expected = expected
         @options  = options
         @block    = block
       end
-    
+
       def matches?(stringlike, &block)
         @block ||= block
         matched = matches(stringlike)
-        
+
         if @options[:count]
           matched.size == @options[:count] && (!@block || @block.call(matched))
         else
           matched.any? && (!@block || @block.call(matched))
         end
       end
-      
+
       def matches(stringlike)
         if Webrat.configuration.parse_with_nokogiri?
           nokogiri_matches(stringlike)
@@ -29,7 +29,7 @@ module Webrat
           rexml_matches(stringlike)
         end
       end
-    
+
       def rexml_matches(stringlike)
         if REXML::Node === stringlike || Array === stringlike
           @query = query.map { |q| q.gsub(%r'//', './') }
@@ -49,48 +49,48 @@ module Webrat
           end
         end.flatten.compact
       end
-    
+
       def nokogiri_matches(stringlike)
         if Nokogiri::XML::NodeSet === stringlike
           @query = query.gsub(%r'//', './')
         else
           @query = query
         end
-        
+
         add_options_conditions_to(@query)
-        
+
         @document = Webrat::XML.document(stringlike)
         @document.xpath(*@query)
       end
-      
+
       def add_options_conditions_to(query)
         add_attributes_conditions_to(query)
         add_content_condition_to(query)
       end
-      
+
       def add_attributes_conditions_to(query)
         attribute_conditions = []
-        
+
         @options.each do |key, value|
           next if [:content, :count].include?(key)
           attribute_conditions << "@#{key} = #{xpath_escape(value)}"
         end
-        
+
         if attribute_conditions.any?
           query << "[#{attribute_conditions.join(' and ')}]"
         end
       end
-      
+
       def add_content_condition_to(query)
         if @options[:content]
           query << "[contains(., #{xpath_escape(@options[:content])})]"
         end
       end
-      
+
       def query
         @expected
       end
-    
+
       # ==== Returns
       # String:: The failure message.
       def failure_message
@@ -102,15 +102,15 @@ module Webrat
       def negative_failure_message
         "expected following text to not match xpath #{@expected}:\n#{@document}"
       end
-      
+
     protected
-    
+
       def xpath_escape(string)
         if string.include?("'") && string.include?('"')
           parts = string.split("'").map do |part|
             "'#{part}'"
           end
-          
+
           "concat(" + parts.join(", \"'\", ") + ")"
         elsif string.include?("'")
           "\"#{string}\""
@@ -118,9 +118,9 @@ module Webrat
           "'#{string}'"
         end
       end
-      
+
     end
-    
+
     # Matches HTML content against an XPath query
     #
     # ==== Parameters
@@ -132,16 +132,16 @@ module Webrat
       HaveXpath.new(expected, options, &block)
     end
     alias_method :match_xpath, :have_xpath
-    
+
     def assert_have_xpath(expected, options = {}, &block)
       hs = HaveXpath.new(expected, options, &block)
       assert hs.matches?(response_body), hs.failure_message
     end
-    
+
     def assert_have_no_xpath(expected, options = {}, &block)
       hs = HaveXpath.new(expected, options, &block)
       assert !hs.matches?(response_body), hs.negative_failure_message
     end
-    
+
   end
-end
+end

data/lib/webrat/core/methods.rb

@@ -10,15 +10,19 @@ module Webrat
         RUBY
       end
     end
-    
+
     def webrat
       webrat_session
     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
     # be created transparently.
     #
@@ -31,7 +35,7 @@ module Webrat
       :header, :http_accept, :basic_auth,
       :save_and_open_page,
       :fills_in, :fill_in,
-      :checks, :check, 
+      :checks, :check,
       :unchecks, :uncheck,
       :chooses, :choose,
       :selects, :select,
@@ -47,15 +51,15 @@ module Webrat
       :select_option,
       :set_hidden_field, :submit_form,
       :request_page, :current_dom,
-      :response_body, 
+      :response_body,
       :selects_date, :selects_time, :selects_datetime,
       :select_date, :select_time, :select_datetime,
       :field_by_xpath,
       :field_with_id,
       :selenium,
       :simulate, :automate
-      
-      
-    
+
+
+
   end
-end
+end

data/lib/webrat/core/mime.rb

@@ -1,6 +1,6 @@
 module Webrat #:nodoc:
   module MIME #:nodoc:
-    
+
     def self.mime_type(string_or_symbol) #:nodoc:
       if string_or_symbol.is_a?(String)
         string_or_symbol
@@ -24,6 +24,6 @@ module Webrat #:nodoc:
         end
       end
     end
-    
+
   end
-end
+end

data/lib/webrat/core/save_and_open_page.rb

@@ -2,21 +2,21 @@ 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/
@@ -25,26 +25,26 @@ module Webrat
         `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
+end