webrat 0.7.0 → 0.7.1

data/Gemfile

@@ -1,9 +1,3 @@
-clear_sources
-source 'http://gemcutter.org'
-
-disable_system_gems
-
-gem "git",              "1.2.5"
 gem "rake",             "0.8.7"
 gem "rspec",            "1.2.9"
 gem "diff-lcs",         "1.1.2"

data/History.txt

@@ -1,3 +1,20 @@
+== 0.7.1 / 2010-04-26
+
+* Minor enhancements
+
+  * Move verbose selenium output that can clutter build output behind setting
+  * Added application_port_for_selenium to webrat configuration. The use case is when you want to test through a web server sitting in front of your application server. (Luke Melia)
+  * New webrat configuration option selenium_firefox_profile which is passed to selenium server
+  * Allow submit_form to select by CSS too (Damian Janowski)
+
+* Bug fixes
+
+  * Fix that current_url wasn't reflecting redirects in Mechanize [#332] (Emrys Ingersoll)
+  * Fix attach_file with nested params [#341] (Álvaro Gil)
+  * Fix that a 304 was considered a redirect (Larry Marburger)
+  * Fix selection of LABEL elements in Selenium mode under IE [#317] (Damian Janowski, Noah Davis)
+  * Fix have_xpath not matching negative expectation in the block [#182] (Luismi Cavallé)
+
 == 0.7.0 / 2010-01-17
 
 * Major enhancements

data/Rakefile

@@ -1,5 +1,3 @@
-require "rubygems"
-
 begin
   require 'spec/rake/spectask'
 rescue LoadError
@@ -90,14 +88,14 @@ namespace :spec do
     namespace :rails do
       task :selenium do
         Dir.chdir "spec/integration/rails" do
-          result = system "rake test_unit:selenium"
+          result = system "rake -rubygems test_unit:selenium"
           raise "Rails integration tests failed" unless result
         end
       end
 
       task :webrat do
         Dir.chdir "spec/integration/rails" do
-          result = system "rake test_unit:rails"
+          result = system "rake -rubygems test_unit:rails"
           raise "Rails integration tests failed" unless result
         end
       end
@@ -106,7 +104,7 @@ namespace :spec do
     desc "Run the Merb integration specs"
     task :merb do
       Dir.chdir "spec/integration/merb" do
-        result = system "rake spec"
+        result = system "rake -rubygems spec"
         raise "Merb integration tests failed" unless result
       end
     end
@@ -114,7 +112,7 @@ namespace :spec do
     desc "Run the Sinatra integration specs"
     task :sinatra do
       Dir.chdir "spec/integration/sinatra" do
-        result = system "rake test"
+        result = system "rake -rubygems test"
         raise "Sinatra integration tests failed" unless result
       end
     end
@@ -122,7 +120,7 @@ namespace :spec do
     desc "Run the Sinatra integration specs"
     task :rack do
       Dir.chdir "spec/integration/rack" do
-        result = system "rake test"
+        result = system "rake -rubygems test"
         raise "Rack integration tests failed" unless result
       end
     end
@@ -130,7 +128,7 @@ namespace :spec do
     desc "Run the Mechanize integration specs"
     task :mechanize do
       Dir.chdir "spec/integration/mechanize" do
-        result = system "rake spec"
+        result = system "rake -rubygems spec"
         raise "Mechanize integration tests failed" unless result
       end
     end
@@ -142,4 +140,4 @@ task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
 end
 
-task :default => :spec
+task :default => :spec

data/lib/webrat.rb

@@ -2,7 +2,7 @@ require "rack"
 require "nokogiri"
 
 module Webrat
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 
   autoload :MechanizeAdapter, "webrat/adapters/mechanize"
   autoload :MerbAdapter, "webrat/adapters/merb"

data/lib/webrat/adapters/mechanize.rb

@@ -4,6 +4,8 @@ module Webrat #:nodoc:
   class MechanizeAdapter #:nodoc:
     extend Forwardable
 
+    Mechanize = WWW::Mechanize if defined?(WWW::Mechanize)
+
     attr_accessor :response
     alias :page :response
 
@@ -20,13 +22,19 @@ module Webrat #:nodoc:
 
     def post(url, data, headers_argument_not_used = nil)
       post_data = data.inject({}) do |memo, param|
-        case param.last
+        case param
         when Hash
-          param.last.each {|attribute, value| memo["#{param.first}[#{attribute}]"] = value }
-        else
-          memo[param.first] = param.last
+          param.each {|attribute, value| memo[attribute] = value }
+          memo
+        when Array
+          case param.last
+          when Hash
+            param.last.each {|attribute, value| memo["#{param.first}[#{attribute}]"] = value }
+          else
+            memo[param.first] = param.last
+          end
+          memo
         end
-        memo
       end
       @response = mechanize.post(url, post_data)
     end
@@ -39,8 +47,16 @@ module Webrat #:nodoc:
       @response.code.to_i
     end
 
+    def response_headers
+      @response.header
+    end
+
     def mechanize
-      @mechanize ||= WWW::Mechanize.new
+      @mechanize ||= begin
+        mechanize = Mechanize.new
+        mechanize.redirect_ok = false
+        mechanize
+      end
     end
 
     def_delegators :mechanize, :basic_auth

data/lib/webrat/adapters/rack.rb

@@ -18,6 +18,10 @@ module Webrat
       response.status
     end
 
+    def response_headers
+      response.headers
+    end
+
     def response
       @session.last_response
     end

data/lib/webrat/adapters/rails.rb

@@ -35,6 +35,10 @@ module Webrat
       response.code.to_i
     end
 
+    def response_headers
+      response.headers
+    end
+
     def xml_content_type?
       response.headers["Content-Type"].to_s =~ /xml/
     end

data/lib/webrat/core/configuration.rb

@@ -40,6 +40,13 @@ module Webrat
     webrat_deprecate :selenium_port, :application_port
     webrat_deprecate :selenium_port=, :application_port=
 
+    # Which port should selenium use to access the application. Defaults to application_port
+    attr_writer :application_port_for_selenium
+    
+    def application_port_for_selenium
+      @application_port_for_selenium || self.application_port
+    end
+
     # Which underlying app framework we're testing with selenium
     attr_accessor :application_framework
 
@@ -58,10 +65,17 @@ module Webrat
     # Set the timeout for waiting for the browser process to start
     attr_accessor :selenium_browser_startup_timeout
 
+    # Set the firefox profile for selenium to use
+    attr_accessor :selenium_firefox_profile
+
     # How many redirects to the same URL should be halted as an infinite redirect
     # loop? Defaults to 10
     attr_accessor :infinite_redirect_limit
 
+    # Print out the full HTML on wait failure
+    # Defaults to false
+    attr_accessor :selenium_verbose_output
+
     def initialize # :nodoc:
       self.open_error_files = true
       self.application_environment = :test
@@ -72,11 +86,12 @@ module Webrat
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
+      self.selenium_verbose_output = false
 
       tmp_dir = Pathname.new(Dir.pwd).join("tmp")
       self.saved_pages_dir = tmp_dir.exist? ? tmp_dir : Dir.pwd
     end
-
+    
     def open_error_files? #:nodoc:
       @open_error_files ? true : false
     end

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

@@ -1,6 +1,7 @@
 require "cgi"
+require "digest/md5"
 require "webrat/core_extensions/blank"
-require "webrat/core_extensions/nil_to_param"
+require "webrat/core_extensions/nil_to_query_string"
 
 require "webrat/core/elements/element"
 
@@ -13,7 +14,7 @@ module Webrat
     attr_reader :value
 
     def self.xpath_search
-      [".//button", ".//input", ".//textarea", ".//select"]
+      ".//button|.//input|.//textarea|.//select"
     end
 
     def self.xpath_search_excluding_hidden
@@ -84,19 +85,17 @@ module Webrat
       raise DisabledFieldError.new("Cannot interact with disabled form element (#{self})")
     end
 
-    def to_param
+    def to_query_string
       return nil if disabled?
 
-      params = case Webrat.configuration.mode
-      when :rails
-        parse_rails_request_params("#{name}=#{escaped_value}")
-      when :merb
-        ::Merb::Parse.query("#{name}=#{escaped_value}")
-      else
-        { name => [*@value].first.to_s }
+      query_string = case Webrat.configuration.mode
+      when :rails, :merb, :rack, :sinatra
+        build_query_string
+      when :mechanize
+        build_query_string(false)
       end
 
-      unescape_params(params)
+      query_string
     end
 
     def set(value)
@@ -109,18 +108,6 @@ module Webrat
 
   protected
 
-    def parse_rails_request_params(params)
-      if defined?(ActionController::AbstractRequest)
-        ActionController::AbstractRequest.parse_query_parameters(params)
-      elsif defined?(ActionController::UrlEncodedPairParser)
-        # For Rails > 2.2
-        ActionController::UrlEncodedPairParser.parse_query_parameters(params)
-      else
-        # For Rails > 2.3
-        Rack::Utils.parse_nested_query(params)
-      end
-    end
-
     def form
       Form.load(@session, form_element)
     end
@@ -138,25 +125,22 @@ module Webrat
       @element["name"]
     end
 
-    def escaped_value
-      CGI.escape(@value.to_s)
-    end
-
-    # Because we have to escape it before sending it to the above case statement,
-    # we have to make sure we unescape each value when it gets back so assertions
-    # involving characters like <, >, and &  work as expected
-    def 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) }
+    def build_query_string(escape_value=true)
+      if @value.is_a?(Array)
+        @value.collect {|value| "#{name}=#{ escape_value ? escape(value) : value }" }.join("&")
       else
-        CGI.unescapeHTML(params)
+        "#{name}=#{ escape_value ? escape(value) : value }"
       end
     end
 
+    def escape(value)
+      CGI.escape(value.to_s)
+    end
+
+    def escaped_value
+      CGI.escape(@value.to_s)
+    end
+
     def labels
       @labels ||= label_elements.map do |element|
         Label.load(@session, element)
@@ -186,22 +170,6 @@ module Webrat
     def default_value
       @element["value"]
     end
-
-    def 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
-          value = value.map { |o| o == oval ? nval : oval }
-        when oval
-          value = nval
-        end
-        output[key] = value
-      end
-      output
-    end
   end
 
   class ButtonField < Field #:nodoc:
@@ -210,7 +178,7 @@ module Webrat
       [".//button", ".//input[@type = 'submit']", ".//input[@type = 'button']", ".//input[@type = 'image']"]
     end
 
-    def to_param
+    def to_query_string
       return nil if @value.nil?
       super
     end
@@ -233,13 +201,13 @@ module Webrat
       ".//input[@type = 'hidden']"
     end
 
-    def to_param
+    def to_query_string
       if collection_name?
         super
       else
         checkbox_with_same_name = form.field_named(name, CheckboxField)
 
-        if checkbox_with_same_name.to_param.blank?
+        if checkbox_with_same_name.to_query_string.blank?
           super
         else
           nil
@@ -261,7 +229,7 @@ module Webrat
       ".//input[@type = 'checkbox']"
     end
 
-    def to_param
+    def to_query_string
       return nil if @value.nil?
       super
     end
@@ -306,7 +274,7 @@ module Webrat
       ".//input[@type = 'radio']"
     end
 
-    def to_param
+    def to_query_string
       return nil if @value.nil?
       super
     end
@@ -363,30 +331,32 @@ module Webrat
     attr_accessor :content_type
 
     def set(value, content_type = nil)
+      @original_value = @value
+      @content_type ||= content_type
       super(value)
-      @content_type = content_type
     end
 
-    def to_param
-      if @value.nil?
-        super
-      else
-        replace_param_value(super, @value, test_uploaded_file)
-      end
+    def digest_value
+      @value ? Digest::MD5.hexdigest(self.object_id.to_s) : ""
     end
 
-  protected
+    def to_query_string
+      @value.nil? ? set("") : set(digest_value)
+      super
+    end
 
     def test_uploaded_file
+      return "" if @original_value.blank?
+
       case Webrat.configuration.mode
       when :rails
         if content_type
-          ActionController::TestUploadedFile.new(@value, content_type)
+          ActionController::TestUploadedFile.new(@original_value, content_type)
         else
-          ActionController::TestUploadedFile.new(@value)
+          ActionController::TestUploadedFile.new(@original_value)
         end
       when :rack, :merb
-        Rack::Test::UploadedFile.new(@value, content_type)
+        Rack::Test::UploadedFile.new(@original_value, content_type)
       end
     end
 
@@ -450,25 +420,6 @@ module Webrat
       @value.delete(value)
     end
 
-    # We have to overide how the uri string is formed when dealing with multiples
-    # Where normally a select field might produce   name=value   with a multiple,
-    # we need to form something like   name[]=value1&name[]=value2
-    def to_param
-      return nil if disabled?
-
-      uri_string = @value.collect {|value| "#{name}=#{CGI.escape(value)}"}.join("&")
-      params = case Webrat.configuration.mode
-      when :rails
-        parse_rails_request_params(uri_string)
-      when :merb
-        ::Merb::Parse.query(uri_string)
-      else
-        { name => @value }
-      end
-
-      unescape_params(params)
-    end
-
   protected
 
     # Overwrite SelectField definition because we don't want to select the first option