webrat 0.7.0 → 0.7.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/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/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
 
@@ -155,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?
@@ -281,7 +282,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');
@@ -21,7 +21,7 @@ var candidateLabels = $A(allLabels).select(function(candidateLabel){
 });
 
 if (candidateLabels.length == 0) {
-  return null;      
+  return null;
 }
 
 //reverse length sort
@@ -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/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

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
@@ -170,8 +175,8 @@ module Webrat
       end
 
       error_message = "#{message} (after #{timeout} sec)"
-
-      if $browser
+      
+      if $browser && Webrat.configuration.selenium_verbose_output
         error_message += <<-EOS
 
 
@@ -232,7 +237,7 @@ EOS
 
     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_for_selenium}")
       $browser.set_speed(0) unless Webrat.configuration.selenium_server_address
 
       at_exit do

data/spec/fakes/test_adapter.rb

@@ -15,7 +15,7 @@ module Webrat #:nodoc:
     end
 
     def response_code
-      @response_code || 200
+      @response_code ||= 200
     end
 
     def get(url, data, headers = nil)

data/spec/integration/mechanize/sample_app.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra/base"
 
 class SampleApp < Sinatra::Default
@@ -17,4 +16,20 @@ class SampleApp < Sinatra::Default
   get "/redirected" do
     "Redirected"
   end
+
+  get "/form" do
+    <<-EOS
+    <html>
+      <form action="/form" method="post">
+        <input type="hidden" name="_method" value="put" />
+        <label for="email">Email:</label> <input type="text" id="email" name="email" /></label>
+        <input type="submit" value="Add" />
+      </form>
+    </html>
+    EOS
+  end
+
+  put "/form" do
+    "Welcome #{params[:email]}"
+  end
 end

data/spec/integration/mechanize/spec/mechanize_spec.rb

@@ -12,7 +12,15 @@ describe "Webrat's Mechanize mode" do
   end
 
   it "should follow links"
-  it "should submit forms"
+
+  it "should submit forms" do
+    visit "http://localhost:9292/form"
+    fill_in "Email", :with => "albert@example.com"
+    response = click_button "Add"
+
+    response.should contain("Welcome albert@example.com")
+  end
+
   it "should not follow external redirects" do
     pending do
       response = visit("http://localhost:9292/external_redirect")

data/spec/integration/rack/app.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra/base"
 
 class RackApp < Sinatra::Base
@@ -39,7 +38,8 @@ class RackApp < Sinatra::Base
   end
 
   post "/upload" do
-    params[:uploaded_file].to_yaml
+    uploaded_file = params[:uploaded_file]
+    Marshal.dump(:tempfile => uploaded_file[:tempfile].read, :type => uploaded_file[:type], :filename => uploaded_file[:filename])
   end
 end
 

data/spec/integration/rack/test/helper.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "test/unit"
 require "rack/test"
 # require "redgreen"

data/spec/integration/rack/test/webrat_rack_test.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require File.dirname(__FILE__) + "/helper"
 
 class WebratRackTest < Test::Unit::TestCase
@@ -52,10 +53,10 @@ class WebratRackTest < Test::Unit::TestCase
     attach_file "File", __FILE__, "text/ruby"
     click_button "Upload"
 
-    upload = YAML.load(response_body)
+    upload = Marshal.load(response_body)
     assert_equal "text/ruby", upload[:type]
     assert_equal "webrat_rack_test.rb", upload[:filename]
-    assert upload[:tempfile].respond_to?(:read)
+    assert_equal File.read(__FILE__), upload[:tempfile]
   end
 end
 

data/spec/integration/sinatra/classic_app.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra"
 
 use_in_file_templates!

data/spec/integration/sinatra/modular_app.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra/base"
 
 class MyModularApp < Sinatra::Default

data/spec/integration/sinatra/test/classic_app_test.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require File.dirname(__FILE__) + "/test_helper"
 require File.dirname(__FILE__) + "/../classic_app"
 

data/spec/integration/sinatra/test/test_helper.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "test/unit"
 # require "redgreen"
 

data/spec/private/core/field_spec.rb

@@ -77,7 +77,7 @@ module Webrat
 
       element    = Webrat::XML.document(html).css('input').first
       text_field = TextField.new(nil, element)
-      text_field.to_param.should == { 'email' => 'user@example.com' }
+      text_field.to_query_string.should == 'email=user@example.com'
     end
   end
 end

data/spec/private/core/form_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "Multiple nested params" do
+  it "should be corretly posted" do
+    Webrat.configuration.mode = :rails
+
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/family">
+        <div class="couple">
+          <div class="parent">
+            <select name="user[family][parents][0][][gender]">
+              <option selected="selected" value="Mother">Mother</option>
+              <option value="Father">Father</option>
+            </select>
+            <input type="text" value="Alice" name="user[family][parents][0][][name]" />
+          </div>
+          <div class="parent">
+            <select name="user[family][parents][0][][gender]">
+              <option value="Mother">Mother</option>
+              <option selected="selected" value="Father">Father</option>
+            </select>
+            <input type="text" value="Michael" name="user[family][parents][0][][name]" />
+          </div>
+        </div>
+        <div class="couple">
+          <div class="parent">
+            <select name="user[family][parents][1][][gender]">
+              <option selected="selected" value="Mother">Mother</option>
+              <option value="Father">Father</option>
+            </select>
+            <input type="text" value="Jenny" name="user[family][parents][1][][name]" />
+          </div>
+        </div>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+
+    params = { "user" => { "family" => { "parents" => {
+            "0" => [ {"name" => "Alice", "gender"=>"Mother"}, {"name" => "Michael", "gender"=>"Father"} ],
+            "1" => [ {"name" => "Jenny", "gender"=>"Mother"} ]
+          }
+        }
+      }
+    }
+
+    webrat_session.should_receive(:post).with("/family", params)
+    click_button
+  end
+end