honkster-webrat 0.6.0.10 → 0.7.1.1

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

@@ -38,15 +38,24 @@ module Webrat
       end
     end
 
+    # iterate over all form fields to build a request querystring to get params from it,
+    # for file_field we made a work around to pass a digest as value to later replace it
+    # in params hash with the real file.
     def params
-      all_params = {}
+      query_string = []
+      replaces = {}
 
       fields.each do |field|
-        next if field.to_param.nil?
-        merge(all_params, field.to_param)
+        next if field.to_query_string.nil?
+        replaces.merge!({field.digest_value => field.test_uploaded_file}) if field.is_a?(FileField)
+        query_string << field.to_query_string
       end
 
-      all_params
+      query_params = self.class.query_string_to_params(query_string.join('&'))
+
+      query_params = self.class.replace_params_values(query_params, replaces)
+
+      self.class.unescape_params(query_params)
     end
 
     def form_method
@@ -57,47 +66,62 @@ module Webrat
       @element["action"].blank? ? @session.current_url : @element["action"]
     end
 
-    def merge(all_params, new_param)
-      new_param.each do |key, value|
-        case all_params[key]
-        when *hash_classes
-          merge_hash_values(all_params[key], value)
+    def self.replace_param_value(params, oval, nval)
+      output = Hash.new
+      params.each do |key, value|
+        case value
+        when Hash
+          value = replace_param_value(value, oval, nval)
         when Array
-          all_params[key] += value
-        else
-          all_params[key] = value
+          value = value.map { |o| o == oval ? nval : ( o.is_a?(Hash) ? replace_param_value(o, oval, nval) : o) }
+        when oval
+          value = nval
         end
+        output[key] = value
       end
+      output
     end
 
-    def merge_hash_values(a, b) # :nodoc:
-      a.keys.each do |k|
-        if b.has_key?(k)
-          case [a[k], b[k]].map{|value| value.class}
-          when *hash_classes.zip(hash_classes)
-            a[k] = merge_hash_values(a[k], b[k])
-            b.delete(k)
-          when [Array, Array]
-            a[k] += b[k]
-            b.delete(k)
-          end
-        end
+    def self.replace_params_values(params, values)
+      values.each do |key, value|
+        params = replace_param_value(params, key, value)
       end
-      a.merge!(b)
+      params
     end
 
-    def hash_classes
-      klasses = [Hash]
+    def self.unescape_params(params)
+      case params.class.name
+      when 'Hash', 'Mash'
+        params.each { |key,value| params[key] = unescape_params(value) }
+        params
+      when 'Array'
+        params.collect { |value| unescape_params(value) }
+      else
+        params.is_a?(String) ? CGI.unescapeHTML(params) : params
+      end
+    end
 
+    def self.query_string_to_params(query_string)
       case Webrat.configuration.mode
       when :rails
-        klasses << HashWithIndifferentAccess
+        parse_rails_request_params(query_string)
       when :merb
-        klasses << Mash
+        ::Merb::Parse.query(query_string)
+      when :rack, :sinatra
+        Rack::Utils.parse_nested_query(query_string)
+      else
+        query_string.split('&').map {|query| { query.split('=').first => query.split('=').last }}
       end
-
-      klasses
     end
 
+    def self.parse_rails_request_params(query_string)
+      if defined?(ActionController::AbstractRequest)
+        ActionController::AbstractRequest.parse_query_parameters(query_string)
+      elsif defined?(ActionController::UrlEncodedPairParser)
+        ActionController::UrlEncodedPairParser.parse_query_parameters(query_string)
+      else
+        Rack::Utils.parse_nested_query(query_string)
+      end
+    end
   end
 end

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

@@ -10,7 +10,7 @@ module Webrat
       end
 
       def form_element
-        @dom.css("#" + @value).first
+        @dom.css("#" + @value).first || @dom.css(@value).first
       end
 
     end

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

@@ -15,7 +15,7 @@ module Webrat
 
       def locate
         if @id_or_name_or_label
-          field = FieldLocator.new(@session, @dom, @id_or_name_or_label, SelectField).locate!
+          field = FieldLocator.new(@session, @dom, @id_or_name_or_label, SelectField, MultipleSelectField).locate!
 
           field.options.detect do |o|
             if @option_text.is_a?(Regexp)

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

@@ -12,7 +12,7 @@ module Webrat
 
         case @content
         when String
-          @element.include?(@content)
+          @element.gsub(/\s+/, ' ').include?(@content)
         when Regexp
           @element.match(@content)
         end

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

@@ -14,10 +14,12 @@ module Webrat
         @block ||= block
         matched = matches(stringlike)
 
+        @block.call(matched) if @block
+
         if @options[:count]
-          matched.size == @options[:count].to_i && (!@block || @block.call(matched))
+          matched.size == @options[:count].to_i
         else
-          matched.any? && (!@block || @block.call(matched))
+          matched.any?
         end
       end
 

data/lib/webrat/core/methods.rb

@@ -3,7 +3,7 @@ module Webrat
 
     def self.delegate_to_session(*meths)
       meths.each do |meth|
-        self.class_eval <<-RUBY
+        self.class_eval(<<-RUBY, __FILE__, __LINE__)
           def #{meth}(*args, &blk)
             webrat_session.#{meth}(*args, &blk)
           end

data/lib/webrat/core/mime.rb

@@ -8,8 +8,8 @@ module Webrat #:nodoc:
     def mime_type(type)
       return type if type.nil? || type.to_s.include?("/")
       type = ".#{type}" unless type.to_s[0] == ?.
-      MIME_TYPES.fetch(type) { |type|
-        raise ArgumentError.new("Invalid Mime type: #{type}")
+      MIME_TYPES.fetch(type) { |invalid_type|
+        raise ArgumentError.new("Invalid Mime type: #{invalid_type}")
       }
     end
 

data/lib/webrat/core/save_and_open_page.rb

@@ -6,12 +6,12 @@ module Webrat
     # Example:
     #   save_and_open_page
     def save_and_open_page
-      return unless File.exist?(saved_page_dir)
+      return unless File.exist?(Webrat.configuration.saved_pages_dir)
 
-      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.html"
+      filename = "#{Webrat.configuration.saved_pages_dir}/webrat-#{Time.now.to_i}.html"
 
       File.open(filename, "w") do |f|
-        f.write rewrite_css_and_image_references(response_body)
+        f.write response_body
       end
 
       open_in_browser(filename)
@@ -24,25 +24,5 @@ module Webrat
       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)/, '\1' + doc_root + '/\2')
-    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

@@ -28,6 +28,7 @@ module Webrat
     attr_reader :session
 
     def initialize(session, &block) #:nodoc:
+      @selector, @dom = nil
       @session = session
       instance_eval(&block) if block_given?
 

data/lib/webrat/core/session.rb

@@ -65,7 +65,7 @@ For example:
     attr_reader :current_url
     attr_reader :elements
 
-    def_delegators :@adapter, :response, :response_code, :response_body,
+    def_delegators :@adapter, :response, :response_code, :response_body, :response_headers,
       :response_body=, :response_code=,
       :get, :post, :put, :delete
 
@@ -75,6 +75,7 @@ For example:
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
+      @current_url     = nil
       reset
     end
 
@@ -92,10 +93,6 @@ For example:
       page
     end
 
-    def doc_root #:nodoc:
-      nil
-    end
-
     def header(key, value)
       @custom_headers[key] = value
     end
@@ -159,7 +156,7 @@ For example:
     end
 
     def redirect? #:nodoc:
-      (response_code / 100).to_i == 3
+      [301, 302, 303, 307].include?(response_code)
     end
 
     def internal_redirect?
@@ -286,7 +283,7 @@ For example:
     end
 
     def response_location
-      response.headers["Location"]
+      response_headers['Location']
     end
 
     def current_host

data/lib/webrat/core_extensions/{nil_to_param.rb → nil_to_query_string.rb}

@@ -1,5 +1,5 @@
 class NilClass #:nodoc:
-  def to_param
+  def to_query_string
     nil
   end
 end

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

@@ -10,7 +10,7 @@ RegExp.escape = function(text) {
     );
   }
   return text.replace(arguments.callee.sRE, '\\$1');
-}
+};
 
 var allLabels = inDocument.getElementsByTagName("label");
 var regExp = new RegExp('^\\W*' + RegExp.escape(locator) + '(\\b|$)', 'i');
@@ -30,7 +30,13 @@ candidateLabels = candidateLabels.sortBy(function(s) {
 });
 
 var locatedLabel = candidateLabels.first();
-var labelFor = locatedLabel.getAttribute('for');
+var labelFor = null;
+
+if (locatedLabel.getAttribute('for')) {
+  labelFor = locatedLabel.getAttribute('for');
+} else if (locatedLabel.attributes['for']) { // IE
+  labelFor = locatedLabel.attributes['for'].nodeValue;
+}
 
 if ((labelFor == null) && (locatedLabel.hasChildNodes())) {
   return locatedLabel.getElementsByTagName('button')[0]

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

@@ -7,29 +7,33 @@ module Webrat
         end
 
         def matches?(response)
-          if @content.is_a?(Regexp)
-            text_finder = "regexp:#{@content.source}"
-          else
-            text_finder = @content
+          response.session.wait_for do
+            response.selenium.is_text_present(text_finder)
           end
+        rescue Webrat::TimeoutError => e
+          @error_message = e.message
+          false
+        end
 
+        def does_not_match?(response)
           response.session.wait_for do
-            response.selenium.is_text_present(text_finder)
+            !response.selenium.is_text_present(text_finder)
           end
-          rescue Webrat::TimeoutError
-            false
+        rescue Webrat::TimeoutError => e
+          @error_message = e.message
+          false
         end
 
         # ==== Returns
         # String:: The failure message.
         def failure_message
-          "expected the following element's content to #{content_message}:\n#{@element}"
+          "expected the response to #{content_message}:\n#{@error_message}"
         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}"
+          "expected the response to not #{content_message}"
         end
 
         def content_message
@@ -40,6 +44,14 @@ module Webrat
             "match #{@content.inspect}"
           end
         end
+
+        def text_finder
+          if @content.is_a?(Regexp)
+            "regexp:#{@content.source}"
+          else
+            @content
+          end
+        end
       end
 
       # Matches the contents of an HTML document with
@@ -52,7 +64,7 @@ module Webrat
       # the supplied string or regexp
       def assert_contain(content)
         hc = HasContent.new(content)
-       assert hc.matches?(response), hc.failure_message
+        assert hc.matches?(response), hc.failure_message
       end
 
       # Asserts that the body of the response

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

@@ -14,6 +14,14 @@ module Webrat
             false
         end
 
+        def does_not_match?(response)
+          response.session.wait_for do
+            !response.selenium.is_element_present("css=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
         # ==== Returns
         # String:: The failure message.
         def failure_message

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

@@ -14,6 +14,14 @@ module Webrat
             false
         end
 
+        def does_not_match?(response)
+          response.session.wait_for do
+            !response.selenium.is_element_present("xpath=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
         # ==== Returns
         # String:: The failure message.
         def failure_message

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -31,10 +31,13 @@ module Webrat
 
       def remote_control
         return @remote_control if @remote_control
+        server_options = { :timeout => Webrat.configuration.selenium_browser_startup_timeout }
+        server_options[:firefox_profile] = Webrat.configuration.selenium_firefox_profile if Webrat.configuration.selenium_firefox_profile
 
         @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
                                                                        Webrat.configuration.selenium_server_port,
-                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
+                                                                       server_options)
+
         @remote_control.jar_file = jar_path
 
         return @remote_control
@@ -61,7 +64,7 @@ module Webrat
           TCPSocket.wait_for_service_with_timeout \
             :host     => (Webrat.configuration.selenium_server_address || "0.0.0.0"),
             :port     => Webrat.configuration.selenium_server_port,
-            :timeout  => 15 # seconds
+            :timeout  => 45 # seconds
         end
       end
 

data/lib/webrat/selenium/selenium_session.rb

@@ -3,7 +3,12 @@ require "webrat/selenium/selenium_rc_server"
 require "webrat/selenium/application_server_factory"
 require "webrat/selenium/application_servers/base"
 
-require "selenium"
+begin
+  require "selenium"
+rescue LoadError => e
+  e.message << " (You may need to install the selenium-rc gem)"
+  raise e
+end
 
 module Webrat
   class TimeoutError < WebratError
@@ -175,8 +180,8 @@ module Webrat
       end
 
       error_message = "#{message} (after #{timeout} sec)"
-
-      if $browser
+      
+      if $browser && Webrat.configuration.selenium_verbose_output
         error_message += <<-EOS
 
 
@@ -200,9 +205,9 @@ HTML of the page was:
 
 
     def save_and_open_screengrab
-      return unless File.exist?(saved_page_dir)
+      return unless File.exist?(Webrat.configuration.saved_pages_dir)
 
-      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.png"
+      filename = "#{Webrat.configuration.saved_pages_dir}/webrat-#{Time.now.to_i}.png"
 
       if $browser.chrome_backend?
         $browser.capture_entire_page_screenshot(filename, '')
@@ -236,13 +241,8 @@ HTML of the page was:
 
 
     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.default_timeout_in_seconds || 10
-      )
+      $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_for_selenium}")
       $browser.set_speed(0) unless Webrat.configuration.selenium_server_address
 
       at_exit do