History

.gitignore

@@ -13,6 +13,3 @@ results
 test_apps
 *.tmproj
 *.log
-*.pid
-bin
-vendor/gems

Gemfile

@@ -1,13 +0,0 @@
-gem "rake",             "0.8.7"
-gem "rspec",            "1.2.9"
-gem "diff-lcs",         "1.1.2"
-gem "rack",             "1.0.1"
-gem "nokogiri",         "1.4.0"
-gem "merb-core",        "1.0.15"
-gem "selenium-client",  "1.2.17"
-gem "mechanize",        "0.9.3"
-gem "rails",            "2.3.4"
-gem "launchy",          "0.3.3"
-gem "rack-test",        "0.5.2"
-gem "sinatra",          "0.9.4"
-gem "mongrel",          "1.1.5"

History.txt

@@ -1,65 +1,8 @@
-== 0.7.1 / 2010-04-26
+== Git
-
-* 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
-
-  * Upgrade bundled Selenium server JAR to 2.0a1 (Henry Poydar and Jake Scruggs)
-
-* Minor enhancements
-
-  * Save and open page directory specified via configuration, defaults to tmp dir otherwise current dir (Noah Davis)
-
-* Bug fixes
-
-  * Added missing dependency "rack-test" to gemspec (LH #339) (Noah Davis)
-  * Removed save_and_open_page's rewriting of static asset paths before saving (was not actually working) (Noah Davis)
-  * Make "should contain" ignore extra whitespace when doing string comparisons (Noah Davis)
-  * Make selenium matchers handle negative match more consistently with positive match (Luke Melia)
-   
-== 0.6.0 / 2009-11-28
-
-REMOVED: Support for Hpricot + REXML as an alternative to Nokogiri.
-
-  Hpricot and REXML were difficult to work with, REXML is terribly slow,
-  and Nokogiri is recommended even by the author of Hpricot (_why). Now
-  that Nokogiri works on JRuby, Webrat is going to use it as its sole
-  XML backend.
-
-CHANGED: Due to a reorganization, if you're currently requiring "webrat/rspec-rails",
-  please change your code to require "webrat/integrations/rspec-rails"
-
-* Minor enhancements
-
-  * Support Rails 2.3.4 JavaScript form authenticity tokens in simulated mode (Jonathan Weiss)
-  * When a timeout occurs in wait_for, include the HTML from Selenium in the exception
-  * Update the Merb support to be based directly on Rack (Simon Rozet)
-  * Support multiple select fields (Kieran P)
-  * When locating select options, always match against text, not HTML
-
-* Bug fixes
-
-  * Remove newlines from HTTP Basic authentication credentials (Michael Klett)
-  * Require nokogiri form rspec-rails.rb (David Chelimsky)
     * Fix logger issue when running inside Cucumber (Damian Janowski)
-  * Fix various issues related to submitting values with HTML entities (Kieran P)
-  * Call #to_i on the :count option in matchers (Michael Christenson II)
-  * Fix bug where multiline param values were getting truncated
 
 == 0.5.3 / 2009-08-27
 

Rakefile

@@ -1,9 +1,40 @@
 begin
-  require 'spec/rake/spectask'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |s|
+    s.name      = "webrat"
+    s.author    = "Bryan Helmkamp"
+    s.email     = "bryan" + "@" + "brynary.com"
+    s.homepage  = "http://github.com/brynary/webrat"
+    s.summary   = "Ruby Acceptance Testing for Web applications"
+    s.description  = <<-EOS.strip
+Webrat lets you quickly write expressive and robust acceptance tests
+for a Ruby web application. It supports simulating a browser inside
+a Ruby process to avoid the performance hit and browser dependency of
+Selenium or Watir, but the same API can also be used to drive real
+Selenium tests when necessary (eg. for testing AJAX interactions).
+Most Ruby web frameworks and testing frameworks are supported.
+    EOS
+
+    s.rubyforge_project = "webrat"
+    s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt History.txt]
+
+    # Dependencies
+    s.add_dependency "nokogiri", ">= 1.2.0"
+    s.add_dependency "rack", ">= 1.0"
+
+    # TODO: Add development dependencies
+  end
+
+  Jeweler::RubyforgeTasks.new
 rescue LoadError
-  desc "Run specs"
+  puts "Jeweler not available. Install it with: gem install jeweler"
-  task(:spec) { $stderr.puts '`gem install rspec` to run specs' }
+end
-else
+
+# require 'spec'
+require 'spec/rake/spectask'
+require 'spec/rake/verify_rcov'
+
 desc "Run API and Core specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
@@ -19,6 +50,9 @@ else
     IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
   end
 end
+
+RCov::VerifyTask.new(:verify_rcov => :rcov) do |t|
+  t.threshold = 96.2 # Make sure you have rcov 0.7 or higher!
 end
 
 desc "Run everything against multiruby"
@@ -73,29 +107,29 @@ task :spec_deps do
   end
 end
 
+task :prepare do
+  system "ln -s ../../../../.. ./spec/integration/rails/vendor/plugins/webrat"
+end
+
 namespace :spec do
   desc "Run the integration specs"
-  task :integration => [
+  task :integration => ["integration:rails", "integration:merb", "integration:sinatra", "integration:rack", "integration:mechanize"]
-    "integration:rack",
-    "integration:sinatra",
-    "integration:merb",
-    "integration:mechanize",
-    "integration:rails:webrat",
-    "integration:rails:selenium",
-  ]
 
   namespace :integration do
+    desc "Run the Rails integration specs"
+    task :rails => ['rails:webrat'] #,'rails:selenium'] currently not running selenium as it doesn't pass.
+
     namespace :rails do
       task :selenium do
         Dir.chdir "spec/integration/rails" do
-          result = system "rake -rubygems test_unit:selenium"
+          result = system "rake test_unit:selenium"
           raise "Rails integration tests failed" unless result
         end
       end
 
       task :webrat do
         Dir.chdir "spec/integration/rails" do
-          result = system "rake -rubygems test_unit:rails"
+          result = system "rake test_unit:rails"
           raise "Rails integration tests failed" unless result
         end
       end
@@ -104,7 +138,7 @@ namespace :spec do
     desc "Run the Merb integration specs"
     task :merb do
       Dir.chdir "spec/integration/merb" do
-        result = system "rake -rubygems spec"
+        result = system "rake spec"
         raise "Merb integration tests failed" unless result
       end
     end
@@ -112,7 +146,7 @@ namespace :spec do
     desc "Run the Sinatra integration specs"
     task :sinatra do
       Dir.chdir "spec/integration/sinatra" do
-        result = system "rake -rubygems test"
+        result = system "rake test"
         raise "Sinatra integration tests failed" unless result
       end
     end
@@ -120,7 +154,7 @@ namespace :spec do
     desc "Run the Sinatra integration specs"
     task :rack do
       Dir.chdir "spec/integration/rack" do
-        result = system "rake -rubygems test"
+        result = system "rake test"
         raise "Rack integration tests failed" unless result
       end
     end
@@ -128,7 +162,7 @@ namespace :spec do
     desc "Run the Mechanize integration specs"
     task :mechanize do
       Dir.chdir "spec/integration/mechanize" do
-        result = system "rake -rubygems spec"
+        result = system "rake spec"
         raise "Mechanize integration tests failed" unless result
       end
     end
@@ -140,4 +174,8 @@ task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
 end
 
+if defined?(Jeweler)
+  task :spec => :check_dependencies
+end
+
 task :default => :spec

Thorfile

@@ -1,118 +0,0 @@
-module GemHelpers
-
-  def generate_gemspec
-    $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "lib")))
-    require "webrat"
-
-    Gem::Specification.new do |s|
-      s.name      = "webrat"
-      s.version   = Webrat::VERSION
-      s.author    = "Bryan Helmkamp"
-      s.email     = "bryan@brynary.com"
-      s.homepage  = "http://github.com/brynary/webrat"
-      s.summary   = "Ruby Acceptance Testing for Web applications"
-      s.description  = <<-EOS.strip
-Webrat lets you quickly write expressive and robust acceptance tests
-for a Ruby web application. It supports simulating a browser inside
-a Ruby process to avoid the performance hit and browser dependency of
-Selenium or Watir, but the same API can also be used to drive real
-Selenium tests when necessary (eg. for testing AJAX interactions).
-Most Ruby web frameworks and testing frameworks are supported.
-      EOS
-      s.rubyforge_project = "webrat"
-
-      require "git"
-      repo = Git.open(".")
-
-      s.files      = normalize_files(repo.ls_files.keys - repo.lib.ignored_files)
-      s.test_files = normalize_files(Dir['spec/**/*.rb'] - repo.lib.ignored_files)
-
-      s.has_rdoc = true
-      s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt History.txt]
-
-      s.add_dependency "nokogiri", ">= 1.2.0"
-      s.add_dependency "rack", ">= 1.0"
-      s.add_dependency "rack-test", ">= 0.5.3"
-    end
-  end
-
-  def normalize_files(array)
-    # only keep files, no directories, and sort
-    array.select do |path|
-      File.file?(path)
-    end.sort
-  end
-
-  # Adds extra space when outputting an array. This helps create better version
-  # control diffs, because otherwise it is all on the same line.
-  def prettyify_array(gemspec_ruby, array_name)
-    gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
-      leadin, files = match[0..-2].split("[")
-      leadin + "[\n    #{files.split(",").join(",\n   ")}\n  ]"
-    end
-  end
-
-  def read_gemspec
-    @read_gemspec ||= eval(File.read("webrat.gemspec"))
-  end
-
-  def sh(command)
-    puts command
-    system command
-  end
-end
-
-class Default < Thor
-  include GemHelpers
-
-  desc "gemspec", "Regenerate webrat.gemspec"
-  def gemspec
-    File.open("webrat.gemspec", "w") do |file|
-      gemspec_ruby = generate_gemspec.to_ruby
-      gemspec_ruby = prettyify_array(gemspec_ruby, :files)
-      gemspec_ruby = prettyify_array(gemspec_ruby, :test_files)
-      gemspec_ruby = prettyify_array(gemspec_ruby, :extra_rdoc_files)
-
-      file.write gemspec_ruby
-    end
-
-    puts "Wrote gemspec to webrat.gemspec"
-    read_gemspec.validate
-  end
-
-  desc "build", "Build a webrat gem"
-  def build
-    sh "gem build webrat.gemspec"
-    FileUtils.mkdir_p "pkg"
-    FileUtils.mv read_gemspec.file_name, "pkg"
-  end
-
-  desc "install", "Install the latest built gem"
-  def install
-    sh "gem install --local pkg/#{read_gemspec.file_name}"
-  end
-
-  desc "release", "Release the current branch to GitHub and Gemcutter"
-  def release
-    gemspec
-    build
-    Release.new.tag
-    Release.new.gem
-  end
-end
-
-class Release < Thor
-  include GemHelpers
-
-  desc "tag", "Tag the gem on the origin server"
-  def tag
-    release_tag = "v#{read_gemspec.version}"
-    sh "git tag -a #{release_tag} -m 'Tagging #{release_tag}'"
-    sh "git push origin #{release_tag}"
-  end
-
-  desc "gem", "Push the gem to Gemcutter"
-  def gem
-    sh "gem push pkg/#{read_gemspec.file_name}"
-  end
-end

VERSION

@@ -0,0 +1 @@
+0.5.3

lib/webrat.rb

@@ -1,18 +1,10 @@
-require "rack"
-require "nokogiri"
-
 module Webrat
-  VERSION = "0.7.2.pre"
-
-  autoload :MechanizeAdapter, "webrat/adapters/mechanize"
-  autoload :MerbAdapter, "webrat/adapters/merb"
-  autoload :RackAdapter, "webrat/adapters/rack"
-  autoload :RailsAdapter, "webrat/adapters/rails"
-  autoload :SinatraAdapter, "webrat/adapters/sinatra"
-
   # The common base class for all exceptions raised by Webrat.
   class WebratError < StandardError
   end
 end
 
+require "rack"
+require "nokogiri"
+require "webrat/core/xml/nokogiri"
 require "webrat/core"

lib/webrat/adapters/merb.rb

@@ -1,11 +0,0 @@
-require "webrat/integrations/merb"
-
-module Webrat
-  class MerbAdapter < RackAdapter #:nodoc:
-    def initialize(context=nil)
-      app = context.respond_to?(:app) ?
-        context.app : Merb::Rack::Application.new
-      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
-    end
-  end
-end

lib/webrat/core.rb

@@ -1,5 +1,6 @@
 require "webrat/core/configuration"
 require "webrat/core/xml"
+require "webrat/core/xml/nokogiri"
 require "webrat/core/logging"
 require "webrat/core/elements/form"
 require "webrat/core/scope"

lib/webrat/core/configuration.rb

@@ -1,5 +1,4 @@
 require "webrat/core_extensions/deprecate"
-require "pathname"
 
 module Webrat
 
@@ -17,20 +16,20 @@ module Webrat
   # Webrat can be configured using the Webrat.configure method. For example:
   #
   #   Webrat.configure do |config|
-  #     config.mode = :sinatra
+  #     config.parse_with_nokogiri = false
   #   end
   class Configuration
 
+    # Should XHTML be parsed with Nokogiri? Defaults to true, except on JRuby. When false, Hpricot and REXML are used
+    attr_writer :parse_with_nokogiri
+
     # Webrat's mode, set automatically when requiring webrat/rails, webrat/merb, etc.
     attr_reader :mode # :nodoc:
 
     # Save and open pages with error status codes (500-599) in a browser? Defualts to true.
     attr_writer :open_error_files
 
-    # Save and open page storage directory, defaults to "tmp" under current directory if exists, otherwise current directory
+    # Which rails environment should the selenium tests be run in? Defaults to selenium.
-    attr_accessor :saved_pages_dir
-
-    # Which rails environment should the selenium tests be run in? Defaults to test.
     attr_accessor :application_environment
     webrat_deprecate :selenium_environment, :application_environment
     webrat_deprecate :selenium_environment=, :application_environment=
@@ -40,13 +39,6 @@ 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
 
@@ -65,19 +57,13 @@ 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.parse_with_nokogiri = true
       self.application_environment = :test
       self.application_port = 3001
       self.application_address = 'localhost'
@@ -86,10 +72,10 @@ module Webrat
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
-      self.selenium_verbose_output = false
+    end
 
-      tmp_dir = Pathname.new(Dir.pwd).join("tmp")
+    def parse_with_nokogiri? #:nodoc:
-      self.saved_pages_dir = tmp_dir.exist? ? tmp_dir : Dir.pwd
+      @parse_with_nokogiri ? true : false
     end
 
     def open_error_files? #:nodoc:
@@ -101,11 +87,13 @@ module Webrat
     def mode=(mode)
       @mode = mode.to_sym
 
-      begin
+      # This is a temporary hack to support backwards compatibility
-        require("webrat/integrations/#{mode}")
+      # with Merb 1.0.8 until it's updated to use the new Webrat.configure
-      rescue LoadError
+      # syntax
-        # Only some modes have integration code that needs to
+      if @mode == :merb
-        # be loaded, so this is OK
+        require("webrat/merb_adapter")
+      else
+        require("webrat/#{mode}")
       end
     end
 

lib/webrat/core/elements/area.rb

@@ -4,7 +4,7 @@ module Webrat
   class Area < Element #:nodoc:
 
     def self.xpath_search
-      [".//area"]
+      ".//area"
     end
 
     def click(method = nil, options = {})
@@ -14,7 +14,7 @@ module Webrat
   protected
 
     def href
-      @element["href"]
+      Webrat::XML.attribute(@element, "href")
     end
 
     def absolute_href

lib/webrat/core/elements/element.rb

@@ -3,14 +3,14 @@ module Webrat
   class Element # :nodoc:
 
     def self.load_all(session, dom)
-      dom.xpath(*xpath_search).map do |element|
+      Webrat::XML.xpath_search(dom, xpath_search).map do |element|
         load(session, element)
       end
     end
 
     def self.load(session, element)
       return nil if element.nil?
-      session.elements[element.path] ||= self.new(session, element)
+      session.elements[Webrat::XML.xpath_to(element)] ||= self.new(session, element)
     end
 
     attr_reader :element
@@ -21,7 +21,7 @@ module Webrat
     end
 
     def path
-      @element.path
+      Webrat::XML.xpath_to(@element)
     end
 
     def inspect

lib/webrat/core/elements/field.rb

@@ -1,7 +1,6 @@
 require "cgi"
-require "digest/md5"
 require "webrat/core_extensions/blank"
-require "webrat/core_extensions/nil_to_query_string"
+require "webrat/core_extensions/nil_to_param"
 
 require "webrat/core/elements/element"
 
@@ -14,7 +13,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
@@ -33,21 +32,16 @@ module Webrat
 
     def self.load(session, element)
       return nil if element.nil?
-      session.elements[element.path] ||= field_class(element).new(session, element)
+      session.elements[Webrat::XML.xpath_to(element)] ||= field_class(element).new(session, element)
     end
 
     def self.field_class(element)
       case element.name
       when "button"   then ButtonField
-      when "select"
+      when "select"   then SelectField
-        if element.attributes["multiple"].nil?
-          SelectField
-        else
-          MultipleSelectField
-        end
       when "textarea" then TextareaField
       else
-        case element["type"]
+        case Webrat::XML.attribute(element, "type")
         when "checkbox" then CheckboxField
         when "hidden"   then HiddenField
         when "radio"    then RadioField
@@ -73,11 +67,11 @@ module Webrat
     end
 
     def id
-      @element["id"]
+      Webrat::XML.attribute(@element, "id")
     end
 
     def disabled?
-      @element.attributes.has_key?("disabled") && @element["disabled"] != 'false'
+      @element.attributes.has_key?("disabled") && Webrat::XML.attribute(@element, "disabled") != 'false'
     end
 
     def raise_error_if_disabled
@@ -85,17 +79,17 @@ module Webrat
       raise DisabledFieldError.new("Cannot interact with disabled form element (#{self})")
     end
 
-    def to_query_string
+    def to_param
       return nil if disabled?
 
-      query_string = case Webrat.configuration.mode
+      case Webrat.configuration.mode
-      when :rails, :merb, :rack, :sinatra
+      when :rails
-        build_query_string
+        parse_rails_request_params("#{name}=#{escaped_value}")
-      when :mechanize
+      when :merb
-        build_query_string(false)
+        ::Merb::Parse.query("#{name}=#{escaped_value}")
+      else
+        { name => value }
       end
-
-      query_string
     end
 
     def set(value)
@@ -108,6 +102,18 @@ 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
@@ -122,23 +128,11 @@ module Webrat
     end
 
     def name
-      @element["name"]
+      Webrat::XML.attribute(@element, "name")
-    end
-
-    def build_query_string(escape_value=true)
-      if @value.is_a?(Array)
-        @value.collect {|value| "#{name}=#{ escape_value ? escape(value) : value }" }.join("&")
-      else
-        "#{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)
+      CGI.escape([*@value].first.to_s)
     end
 
     def labels
@@ -161,14 +155,30 @@ module Webrat
       end
 
       unless id.blank?
-        @label_elements += form.element.xpath(".//label[@for = '#{id}']")
+        @label_elements += Webrat::XML.xpath_search(form.element, ".//label[@for = '#{id}']")
       end
 
       @label_elements
     end
 
     def default_value
-      @element["value"]
+      Webrat::XML.attribute(@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
 
@@ -178,7 +188,7 @@ module Webrat
       [".//button", ".//input[@type = 'submit']", ".//input[@type = 'button']", ".//input[@type = 'image']"]
     end
 
-    def to_query_string
+    def to_param
       return nil if @value.nil?
       super
     end
@@ -189,7 +199,7 @@ module Webrat
 
     def click
       raise_error_if_disabled
-      set(@element["value"]) unless @element["name"].blank?
+      set(Webrat::XML.attribute(@element, "value")) unless Webrat::XML.attribute(@element, "name").blank?
       form.submit
     end
 
@@ -201,13 +211,13 @@ module Webrat
       ".//input[@type = 'hidden']"
     end
 
-    def to_query_string
+    def to_param
       if collection_name?
         super
       else
         checkbox_with_same_name = form.field_named(name, CheckboxField)
 
-        if checkbox_with_same_name.to_query_string.blank?
+        if checkbox_with_same_name.to_param.blank?
           super
         else
           nil
@@ -229,18 +239,18 @@ module Webrat
       ".//input[@type = 'checkbox']"
     end
 
-    def to_query_string
+    def to_param
       return nil if @value.nil?
       super
     end
 
     def check
       raise_error_if_disabled
-      set(@element["value"] || "on")
+      set(Webrat::XML.attribute(@element, "value") || "on")
     end
 
     def checked?
-      @element["checked"] == "checked"
+      Webrat::XML.attribute(@element, "checked") == "checked"
     end
 
     def uncheck
@@ -251,8 +261,8 @@ module Webrat
   protected
 
     def default_value
-      if @element["checked"] == "checked"
+      if Webrat::XML.attribute(@element, "checked") == "checked"
-        @element["value"] || "on"
+        Webrat::XML.attribute(@element, "value") || "on"
       else
         nil
       end
@@ -274,7 +284,7 @@ module Webrat
       ".//input[@type = 'radio']"
     end
 
-    def to_query_string
+    def to_param
       return nil if @value.nil?
       super
     end
@@ -285,11 +295,11 @@ module Webrat
         option.set(nil)
       end
 
-      set(@element["value"] || "on")
+      set(Webrat::XML.attribute(@element, "value") || "on")
     end
 
     def checked?
-      @element["checked"] == "checked"
+      Webrat::XML.attribute(@element, "checked") == "checked"
     end
 
   protected
@@ -299,8 +309,8 @@ module Webrat
     end
 
     def default_value
-      if @element["checked"] == "checked"
+      if Webrat::XML.attribute(@element, "checked") == "checked"
-        @element["value"] || "on"
+        Webrat::XML.attribute(@element, "value") || "on"
       else
         nil
       end
@@ -317,7 +327,7 @@ module Webrat
   protected
 
     def default_value
-      @element.inner_html
+      Webrat::XML.inner_html(@element)
     end
 
   end
@@ -331,32 +341,33 @@ 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 digest_value
+    def to_param
-      @value ? Digest::MD5.hexdigest(self.object_id.to_s) : ""
+      if @value.nil?
-    end
-
-    def to_query_string
-      @value.nil? ? set("") : set(digest_value)
         super
+      else
+        replace_param_value(super, @value, test_uploaded_file)
       end
+    end
+
+  protected
 
     def test_uploaded_file
-      return "" if @original_value.blank?
-
       case Webrat.configuration.mode
       when :rails
         if content_type
-          ActionController::TestUploadedFile.new(@original_value, content_type)
+          ActionController::TestUploadedFile.new(@value, content_type)
         else
-          ActionController::TestUploadedFile.new(@original_value)
+          ActionController::TestUploadedFile.new(@value)
         end
-      when :rack, :merb
+      when :merb
-        Rack::Test::UploadedFile.new(@original_value, content_type)
+        # TODO: support content_type
+        File.new(@value)
+      when :rack
+        Rack::Test::UploadedFile.new(@value, content_type)
       end
     end
 
@@ -370,69 +381,31 @@ module Webrat
 
   class ResetField < Field #:nodoc:
     def self.xpath_search
-      [".//input[@type = 'reset']"]
+      ".//input[@type = 'reset']"
     end
   end
 
   class SelectField < Field #:nodoc:
 
     def self.xpath_search
-      [".//select[not(@multiple)]"]
+      ".//select"
     end
 
     def options
       @options ||= SelectOption.load_all(@session, @element)
     end
 
-    def unset(value)
-      @value = nil
-    end
-
   protected
 
     def default_value
-      selected_options = @element.xpath(".//option[@selected = 'selected']")
+      selected_options = Webrat::XML.xpath_search(@element, ".//option[@selected = 'selected']")
-      selected_options = @element.xpath(".//option[position() = 1]") if selected_options.empty?
+      selected_options = Webrat::XML.xpath_search(@element, ".//option[position() = 1]") if selected_options.empty?
 
       selected_options.map do |option|
         return "" if option.nil?
-        option["value"] || option.inner_html
+        Webrat::XML.attribute(option, "value") || Webrat::XML.inner_html(option)
-      end.uniq.first
-    end
-
-  end
-
-  class MultipleSelectField < Field #:nodoc:
-
-    def self.xpath_search
-      [".//select[@multiple='multiple']"]
-    end
-
-    def options
-      @options ||= SelectOption.load_all(@session, @element)
-    end
-
-    def set(value)
-      @value << value
-    end
-
-    def unset(value)
-      @value.delete(value)
-    end
-
-  protected
-
-    # Overwrite SelectField definition because we don't want to select the first option
-    # (mutliples don't select the first option unlike their non multiple versions)
-    def default_value
-      selected_options = @element.xpath(".//option[@selected = 'selected']")
-
-      selected_options.map do |option|
-        return "" if option.nil?
-        option["value"] || option.inner_html
       end.uniq
     end
 
   end
-
 end

lib/webrat/core/elements/form.rb

@@ -9,7 +9,7 @@ module Webrat
     attr_reader :element
 
     def self.xpath_search
-      [".//form"]
+      ".//form"
     end
 
     def fields
@@ -27,7 +27,7 @@ module Webrat
   protected
 
     def dom
-      @session.dom.xpath(path).first
+      Webrat::XML.xpath_at(@session.dom, path)
     end
 
     def fields_by_type(field_types)
@@ -38,90 +38,66 @@ 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
-      query_string = []
+      all_params = {}
-      replaces = {}
 
       fields.each do |field|
-        next if field.to_query_string.nil?
+        next if field.to_param.nil?
-        replaces.merge!({field.digest_value => field.test_uploaded_file}) if field.is_a?(FileField)
+        merge(all_params, field.to_param)
-        query_string << field.to_query_string
       end
 
-      query_params = self.class.query_string_to_params(query_string.join('&'))
+      all_params
-
-      query_params = self.class.replace_params_values(query_params, replaces)
-
-      self.class.unescape_params(query_params)
     end
 
     def form_method
-      @element["method"].blank? ? :get : @element["method"].downcase
+      Webrat::XML.attribute(@element, "method").blank? ? :get : Webrat::XML.attribute(@element, "method").downcase
     end
 
     def form_action
-      @element["action"].blank? ? @session.current_url : @element["action"]
+      Webrat::XML.attribute(@element, "action").blank? ? @session.current_url : Webrat::XML.attribute(@element, "action")
     end
 
-    def self.replace_param_value(params, oval, nval)
+    def merge(all_params, new_param)
-      output = Hash.new
+      new_param.each do |key, value|
-      params.each do |key, value|
+        case all_params[key]
-        case value
+        when *hash_classes
-        when Hash
+          merge_hash_values(all_params[key], value)
-          value = replace_param_value(value, oval, nval)
         when Array
-          value = value.map { |o| o == oval ? nval : ( o.is_a?(Hash) ? replace_param_value(o, oval, nval) : o) }
+          all_params[key] += value
-        when oval
-          value = nval
-        end
-        output[key] = value
-      end
-      output
-    end
-
-    def self.replace_params_values(params, values)
-      values.each do |key, value|
-        params = replace_param_value(params, key, value)
-      end
-      params
-    end
-
-    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
+          all_params[key] = value
+        end
       end
     end
 
-    def self.query_string_to_params(query_string)
+    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
+      end
+      a.merge!(b)
+    end
+
+    def hash_classes
+      klasses = [Hash]
+
       case Webrat.configuration.mode
       when :rails
-        parse_rails_request_params(query_string)
+        klasses << HashWithIndifferentAccess
       when :merb
-        ::Merb::Parse.query(query_string)
+        klasses << Mash
-      when :rack, :sinatra
+      end
-        Rack::Utils.parse_nested_query(query_string)
+
-      else
+      klasses
-        Hash[query_string.split('&').map {|query| [ query.split('=').first, query.split('=').last ]}]
-      end
     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

lib/webrat/core/elements/label.rb

@@ -6,11 +6,11 @@ module Webrat
     attr_reader :element
 
     def self.xpath_search
-      [".//label"]
+      ".//label"
     end
 
     def for_id
-      @element["for"]
+      Webrat::XML.attribute(@element, "for")
     end
 
     def field
@@ -21,9 +21,9 @@ module Webrat
 
     def field_element
       if for_id.blank?
-        @element.xpath(*Field.xpath_search_excluding_hidden).first
+        Webrat::XML.xpath_at(@element, *Field.xpath_search_excluding_hidden)
       else
-        @session.current_dom.css("#" + for_id).first
+        Webrat::XML.css_search(@session.current_dom, "#" + for_id).first
       end
     end
 

lib/webrat/core/elements/link.rb

@@ -7,7 +7,7 @@ module Webrat
   class Link < Element #:nodoc:
 
     def self.xpath_search
-      [".//a[@href]"]
+      ".//a[@href]"
     end
 
     def click(options = {})
@@ -26,7 +26,7 @@ module Webrat
   protected
 
     def id
-      @element["id"]
+      Webrat::XML.attribute(@element, "id")
     end
 
     def data
@@ -34,11 +34,11 @@ module Webrat
     end
 
     def title
-      @element["title"]
+      Webrat::XML.attribute(@element, "title")
     end
 
     def href
-      @element["href"]
+      Webrat::XML.attribute(@element, "href")
     end
 
     def absolute_href
@@ -53,12 +53,12 @@ module Webrat
 
     def authenticity_token
       return unless onclick && onclick.include?("s.setAttribute('name', 'authenticity_token');") &&
-        ( onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/ || onclick =~ /s\.setAttribute\('value', '(.{44})'\);/ )
+        onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/
       $LAST_MATCH_INFO.captures.first
     end
 
     def onclick
-      @element["onclick"]
+      Webrat::XML.attribute(@element, "onclick")
     end
 
     def http_method

lib/webrat/core/elements/select_option.rb

@@ -4,7 +4,7 @@ module Webrat
   class SelectOption < Element #:nodoc:
 
     def self.xpath_search
-      [".//option"]
+      ".//option"
     end
 
     def choose
@@ -12,15 +12,6 @@ module Webrat
       select.set(value)
     end
 
-    def unchoose
-      select.raise_error_if_disabled
-      select.unset(value)
-    end
-
-    def inner_text
-      @element.inner_text
-    end
-
   protected
 
     def select
@@ -37,11 +28,7 @@ module Webrat
     end
 
     def value
-      @element["value"] || @element.inner_html
+      Webrat::XML.attribute(@element, "value") || Webrat::XML.inner_html(@element)
-    end
-
-    def label
-      @element.inner_html
     end
 
   end

lib/webrat/core/locators.rb

@@ -13,7 +13,7 @@ module Webrat
   module Locators
 
     def field_by_xpath(xpath)
-      Field.load(@session, dom.xpath(xpath).first)
+      Field.load(@session, Webrat::XML.xpath_at(dom, xpath))
     end
 
   end

lib/webrat/core/locators/area_locator.rb

@@ -11,8 +11,8 @@ module Webrat
 
       def area_element
         area_elements.detect do |area_element|
-          area_element["title"] =~ matcher ||
+          Webrat::XML.attribute(area_element, "title") =~ matcher ||
-          area_element["id"] =~ matcher
+          Webrat::XML.attribute(area_element, "id") =~ matcher
         end
       end
 
@@ -21,7 +21,7 @@ module Webrat
       end
 
       def area_elements
-        @dom.xpath(*Area.xpath_search)
+        Webrat::XML.xpath_search(@dom, Area.xpath_search)
       end
 
       def error_message

lib/webrat/core/locators/button_locator.rb

@@ -20,24 +20,24 @@ module Webrat
       end
 
       def matches_id?(element)
-        (@value.is_a?(Regexp) && element["id"] =~ @value) ||
+        (@value.is_a?(Regexp) && Webrat::XML.attribute(element, "id") =~ @value) ||
-        (!@value.is_a?(Regexp) && element["id"] == @value.to_s)
+        (!@value.is_a?(Regexp) && Webrat::XML.attribute(element, "id") == @value.to_s)
       end
 
       def matches_value?(element)
-        element["value"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
+        Webrat::XML.attribute(element, "value") =~ /^\W*#{Regexp.escape(@value.to_s)}/i
       end
 
       def matches_html?(element)
-        element.inner_html =~ /#{Regexp.escape(@value.to_s)}/i
+        Webrat::XML.inner_html(element) =~ /#{Regexp.escape(@value.to_s)}/i
       end
 
       def matches_alt?(element)
-        element["alt"] =~ /^\W*#{Regexp.escape(@value.to_s)}/i
+        Webrat::XML.attribute(element, "alt") =~ /^\W*#{Regexp.escape(@value.to_s)}/i
       end
 
       def button_elements
-        @dom.xpath(*ButtonField.xpath_search)
+        Webrat::XML.xpath_search(@dom, *ButtonField.xpath_search)
       end
 
       def error_message

lib/webrat/core/locators/field_by_id_locator.rb

@@ -12,15 +12,15 @@ module Webrat
       def field_element
         field_elements.detect do |field_element|
           if @value.is_a?(Regexp)
-            field_element["id"] =~ @value
+            Webrat::XML.attribute(field_element, "id") =~ @value
           else
-            field_element["id"] == @value.to_s
+            Webrat::XML.attribute(field_element, "id") == @value.to_s
           end
         end
       end
 
       def field_elements
-        @dom.xpath(*Field.xpath_search)
+        Webrat::XML.xpath_search(@dom, *Field.xpath_search)
       end
 
       def error_message

lib/webrat/core/locators/field_labeled_locator.rb

@@ -25,7 +25,7 @@ module Webrat
       end
 
       def label_elements
-        @dom.xpath(*Label.xpath_search)
+        Webrat::XML.xpath_search(@dom, Label.xpath_search)
       end
 
       def error_message
@@ -33,7 +33,7 @@ module Webrat
       end
 
       def text(element)
-        str = element.inner_text
+        str = Webrat::XML.all_inner_text(element)
         str.gsub!("\n","")
         str.strip!
         str.squeeze!(" ")

lib/webrat/core/locators/field_named_locator.rb

@@ -11,19 +11,19 @@ module Webrat
 
       def field_element
         field_elements.detect do |field_element|
-          field_element["name"] == @value.to_s
+          Webrat::XML.attribute(field_element, "name") == @value.to_s
         end
       end
 
       def field_elements
-        @dom.xpath(*xpath_searches)
+        Webrat::XML.xpath_search(@dom, *xpath_searches)
       end
 
       def xpath_searches
         if @field_types.any?
           @field_types.map { |field_type| field_type.xpath_search }.flatten
         else
-          Field.xpath_search
+          Array(Field.xpath_search)
         end
       end
 

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
+        Webrat::XML.css_at(@dom, "#" + @value)
       end
 
     end

lib/webrat/core/locators/label_locator.rb

@@ -17,11 +17,11 @@ module Webrat
       end
 
       def label_elements
-        @dom.xpath(*Label.xpath_search)
+        Webrat::XML.xpath_search(@dom, Label.xpath_search)
       end
 
       def text(label_element)
-        str = label_element.inner_text
+        str = Webrat::XML.all_inner_text(label_element)
         str.gsub!("\n","")
         str.strip!
         str.squeeze!(" ")

lib/webrat/core/locators/link_locator.rb

@@ -10,7 +10,7 @@ module Webrat
       end
 
       def link_element
-        matching_links.min { |a, b| a.inner_text.length <=> b.inner_text.length }
+        matching_links.min { |a, b| Webrat::XML.all_inner_text(a).length <=> Webrat::XML.all_inner_text(b).length }
       end
 
       def matching_links
@@ -27,21 +27,21 @@ module Webrat
           matcher = /#{Regexp.escape(@value.to_s)}/i
         end
 
-        replace_nbsp(link.inner_text) =~ matcher ||
+        replace_nbsp(Webrat::XML.all_inner_text(link)) =~ matcher ||
-        replace_nbsp_ref(link.inner_html) =~ matcher ||
+        replace_nbsp_ref(Webrat::XML.inner_html(link)) =~ matcher ||
-        link["title"] =~ matcher
+        Webrat::XML.attribute(link, "title")=~ matcher
       end
 
       def matches_id?(link)
         if @value.is_a?(Regexp)
-          link["id"] =~ @value ? true : false
+          (Webrat::XML.attribute(link, "id") =~ @value) ? true : false
         else
-          link["id"] == @value ? true : false
+          (Webrat::XML.attribute(link, "id") == @value) ? true : false
         end
       end
 
       def link_elements
-        @dom.xpath(*Link.xpath_search)
+        Webrat::XML.xpath_search(@dom, *Link.xpath_search)
       end
 
       def replace_nbsp(str)

lib/webrat/core/locators/select_option_locator.rb

@@ -19,17 +19,17 @@ module Webrat
 
           field.options.detect do |o|
             if @option_text.is_a?(Regexp)
-              o.element.inner_text =~ @option_text
+              Webrat::XML.inner_html(o.element) =~ @option_text
             else
-              o.inner_text == @option_text.to_s
+              Webrat::XML.inner_html(o.element) == @option_text.to_s
             end
           end
         else
           option_element = option_elements.detect do |o|
             if @option_text.is_a?(Regexp)
-              o.inner_text =~ @option_text
+              Webrat::XML.inner_html(o) =~ @option_text
             else
-              o.inner_text == @option_text.to_s
+              Webrat::XML.inner_html(o) == @option_text.to_s
             end
           end
 
@@ -38,7 +38,7 @@ module Webrat
       end
 
       def option_elements
-        @dom.xpath(*SelectOption.xpath_search)
+        Webrat::XML.xpath_search(@dom, *SelectOption.xpath_search)
       end
 
       def error_message

lib/webrat/core/logging.rb

@@ -13,7 +13,7 @@ module Webrat
       when :rails
         defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil
       when :merb
-        ::Merb.logger
+        Merb.logger
       else
         @logger ||= ::Logger.new("webrat.log")
       end

lib/webrat/core/matchers/have_content.rb

@@ -7,12 +7,17 @@ module Webrat
       end
 
       def matches?(stringlike)
-        @document = Webrat::XML.document(stringlike)
+        if Webrat.configuration.parse_with_nokogiri?
-        @element = @document.inner_text
+          @document = Webrat.nokogiri_document(stringlike)
+        else
+          @document = Webrat.hpricot_document(stringlike)
+        end
+
+        @element = Webrat::XML.inner_text(@document)
 
         case @content
         when String
-          @element.gsub(/\s+/, ' ').include?(@content)
+          @element.include?(@content)
         when Regexp
           @element.match(@content)
         end

lib/webrat/core/matchers/have_xpath.rb

@@ -1,4 +1,5 @@
-require "webrat/core/xml"
+require "webrat/core/xml/nokogiri"
+require "webrat/core/xml/rexml"
 
 module Webrat
   module Matchers
@@ -14,17 +15,39 @@ module Webrat
         @block ||= block
         matched = matches(stringlike)
 
-        @block.call(matched) if @block
-
         if @options[:count]
-          matched.size == @options[:count].to_i
+          matched.size == @options[:count] && (!@block || @block.call(matched))
         else
-          matched.any?
+          matched.any? && (!@block || @block.call(matched))
         end
       end
 
       def matches(stringlike)
+        if Webrat.configuration.parse_with_nokogiri?
           nokogiri_matches(stringlike)
+        else
+          rexml_matches(stringlike)
+        end
+      end
+
+      def rexml_matches(stringlike)
+        if REXML::Node === stringlike || Array === stringlike
+          @query = query.map { |q| q.gsub(%r'^//', './/') }
+        else
+          @query = query
+        end
+
+        add_options_conditions_to(@query)
+
+        @document = Webrat.rexml_document(stringlike)
+
+        @query.map do |q|
+          if @document.is_a?(Array)
+            @document.map { |d| REXML::XPath.match(d, q) }
+          else
+            REXML::XPath.match(@document, q)
+          end
+        end.flatten.compact
       end
 
       def nokogiri_matches(stringlike)

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, __FILE__, __LINE__)
+        self.class_eval <<-RUBY
           def #{meth}(*args, &blk)
             webrat_session.#{meth}(*args, &blk)
           end
@@ -39,7 +39,6 @@ module Webrat
       :unchecks, :uncheck,
       :chooses, :choose,
       :selects, :select,
-      :unselects, :unselect,
       :attaches_file, :attach_file,
       :current_page,
       :current_url,

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) { |invalid_type|
+      MIME_TYPES.fetch(type) { |type|
-        raise ArgumentError.new("Invalid Mime type: #{invalid_type}")
+        raise ArgumentError.new("Invalid Mime type: #{type}")
       }
     end
 

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?(Webrat.configuration.saved_pages_dir)
+      return unless File.exist?(saved_page_dir)
 
-      filename = "#{Webrat.configuration.saved_pages_dir}/webrat-#{Time.now.to_i}.html"
+      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.html"
 
       File.open(filename, "w") do |f|
-        f.write response_body
+        f.write rewrite_css_and_image_references(response_body)
       end
 
       open_in_browser(filename)
@@ -24,5 +24,25 @@ 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

lib/webrat/core/scope.rb

@@ -28,7 +28,6 @@ module Webrat
     attr_reader :session
 
     def initialize(session, &block) #:nodoc:
-      @selector, @dom = nil
       @session = session
       instance_eval(&block) if block_given?
 
@@ -113,21 +112,6 @@ module Webrat
 
     webrat_deprecate :selects, :select
 
-    # Verifies that a an option element exists on the current page with the specified
-    # text. You can optionally restrict the search to a specific select list by
-    # assigning <tt>options[:from]</tt> the value of the select list's name or
-    # a label. Remove the option's value before the form is submitted.
-    #
-    # Examples:
-    #   unselect "January"
-    #   unselect "February", :from => "event_month"
-    #   unselect "February", :from => "Event Month"
-    def unselect(option_text, options={})
-      select_option(option_text, options[:from]).unchoose
-    end
-
-    webrat_deprecate :unselects, :unselect
-
     DATE_TIME_SUFFIXES = {
       :year   => '1i',
       :month  => '2i',
@@ -328,12 +312,12 @@ module Webrat
         dom = Webrat::XML.html_document(@response_body)
       end
 
-      Webrat::XML.define_dom_method(@response, dom)
+      Webrat.define_dom_method(@response, dom)
       return dom
     end
 
     def scoped_dom
-      @scope.dom.css(@selector).first
+      Webrat::XML.css_at(@scope.dom, @selector)
     end
 
     def locate_field(field_locator, *field_types) #:nodoc:

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, :response_headers,
+    def_delegators :@adapter, :response, :response_code, :response_body,
       :response_body=, :response_code=,
       :get, :post, :put, :delete
 
@@ -75,7 +75,6 @@ For example:
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
-      @current_url     = nil
       reset
     end
 
@@ -93,6 +92,10 @@ For example:
       page
     end
 
+    def doc_root #:nodoc:
+      nil
+    end
+
     def header(key, value)
       @custom_headers[key] = value
     end
@@ -102,7 +105,7 @@ For example:
     end
 
     def basic_auth(user, pass)
-      encoded_login = ["#{user}:#{pass}"].pack("m*").gsub(/\n/, '')
+      encoded_login = ["#{user}:#{pass}"].pack("m*")
       header('HTTP_AUTHORIZATION', "Basic #{encoded_login}")
     end
 
@@ -156,7 +159,7 @@ For example:
     end
 
     def redirect? #:nodoc:
-      [301, 302, 303, 307].include?(response_code)
+      (response_code / 100).to_i == 3
     end
 
     def internal_redirect?
@@ -257,7 +260,6 @@ For example:
     def_delegators :current_scope, :uncheck,            :unchecks
     def_delegators :current_scope, :choose,             :chooses
     def_delegators :current_scope, :select,             :selects
-    def_delegators :current_scope, :unselect,           :unselects
     def_delegators :current_scope, :select_datetime,    :selects_datetime
     def_delegators :current_scope, :select_date,        :selects_date
     def_delegators :current_scope, :select_time,        :selects_time
@@ -282,7 +284,7 @@ For example:
     end
 
     def response_location
-      response_headers['Location']
+      response.headers["Location"]
     end
 
     def current_host

lib/webrat/core/xml.rb

@@ -1,72 +1,115 @@
-require "webrat/core_extensions/meta_class"
+require "webrat/core/xml/nokogiri"
+require "webrat/core/xml/hpricot"
+require "webrat/core/xml/rexml"
 
 module Webrat #:nodoc:
   module XML #:nodoc:
 
     def self.document(stringlike) #:nodoc:
-      return stringlike.dom if stringlike.respond_to?(:dom)
+      if Webrat.configuration.parse_with_nokogiri?
-
+        Webrat.nokogiri_document(stringlike)
-      if Nokogiri::HTML::Document === stringlike
-        stringlike
-      elsif Nokogiri::XML::NodeSet === stringlike
-        stringlike
-      elsif stringlike.respond_to?(:body)
-        Nokogiri::HTML(stringlike.body.to_s)
       else
-        Nokogiri::HTML(stringlike.to_s)
+        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
 
     def self.html_document(stringlike) #:nodoc:
-      return stringlike.dom if stringlike.respond_to?(:dom)
+      if Webrat.configuration.parse_with_nokogiri?
-
+        Webrat.html_nokogiri_document(stringlike)
-      if Nokogiri::HTML::Document === stringlike
-        stringlike
-      elsif Nokogiri::XML::NodeSet === stringlike
-        stringlike
-      elsif stringlike.respond_to?(:body)
-        Nokogiri::HTML(stringlike.body.to_s)
       else
-        Nokogiri::HTML(stringlike.to_s)
+        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
 
     def self.xml_document(stringlike) #:nodoc:
-      return stringlike.dom if stringlike.respond_to?(:dom)
+      if Webrat.configuration.parse_with_nokogiri?
-
+        Webrat.xml_nokogiri_document(stringlike)
-      if Nokogiri::HTML::Document === stringlike
-        stringlike
-      elsif Nokogiri::XML::NodeSet === stringlike
-        stringlike
-      elsif stringlike.respond_to?(:body)
-        Nokogiri::XML(stringlike.body.to_s)
       else
-        Nokogiri::XML(stringlike.to_s)
+        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
 
-    def self.define_dom_method(object, dom) #:nodoc:
+    def self.to_html(element)
-      object.meta_class.send(:define_method, :dom) do
+      if Webrat.configuration.parse_with_nokogiri?
-        dom
+        element.to_html
+      else
+        element.to_s
       end
     end
 
+    def self.inner_html(element)
+      if Webrat.configuration.parse_with_nokogiri?
+        element.inner_html
+      else
+        element.text
       end
     end
 
-module Nokogiri #:nodoc:
+    def self.all_inner_text(element)
-  module CSS #:nodoc:
+      if Webrat.configuration.parse_with_nokogiri?
-    class XPathVisitor #:nodoc:
+        element.inner_text
-
+      else
-      def visit_pseudo_class_text(node) #:nodoc:
+        Hpricot(element.to_s).children.first.inner_text
-        "@type='text'"
+      end
-      end
-
-      def visit_pseudo_class_password(node) #:nodoc:
-        "@type='password'"
     end
 
+    def self.inner_text(element)
+      if Webrat.configuration.parse_with_nokogiri?
+        element.inner_text
+      else
+        if defined?(Hpricot::Doc) && element.is_a?(Hpricot::Doc)
+          element.inner_text
+        else
+          element.text
         end
       end
     end
 
+    def self.xpath_to(element)
+      if Webrat.configuration.parse_with_nokogiri?
+        element.path
+      else
+        element.xpath
+      end
+    end
+
+    def self.attribute(element, attribute_name)
+      return element[attribute_name] if element.is_a?(Hash)
+
+      if Webrat.configuration.parse_with_nokogiri?
+        element[attribute_name]
+      else
+        element.attributes[attribute_name]
+      end
+    end
+
+    def self.xpath_at(*args)
+      xpath_search(*args).first
+    end
+
+    def self.css_at(*args)
+      css_search(*args).first
+    end
+
+    def self.xpath_search(element, *searches)
+      searches.flatten.map do |search|
+        if Webrat.configuration.parse_with_nokogiri?
+          element.xpath(search)
+        else
+          REXML::XPath.match(element, search)
+        end
+      end.flatten.compact
+    end
+
+    def self.css_search(element, *searches) #:nodoc:
+      xpath_search(element, css_to_xpath(*searches))
+    end
+
+    def self.css_to_xpath(*selectors)
+      selectors.map do |rule|
+        Nokogiri::CSS.xpath_for(rule, :prefix => ".//")
+      end.flatten.uniq
+    end
+
+  end
+end

lib/webrat/core/xml/hpricot.rb

@@ -0,0 +1,19 @@
+module Webrat
+
+  def self.hpricot_document(stringlike)
+    return stringlike.dom if stringlike.respond_to?(:dom)
+
+    if Hpricot::Doc === stringlike
+      stringlike
+    elsif Hpricot::Elements === stringlike
+      stringlike
+    elsif StringIO === stringlike
+      Hpricot(stringlike.string)
+    elsif stringlike.respond_to?(:body)
+      Hpricot(stringlike.body.to_s)
+    else
+      Hpricot(stringlike.to_s)
+    end
+  end
+
+end

lib/webrat/core/xml/nokogiri.rb

@@ -0,0 +1,76 @@
+require "webrat/core_extensions/meta_class"
+
+module Webrat
+
+  def self.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.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
+    end
+  end
+
+end
+
+
+module Nokogiri #:nodoc:
+  module CSS #:nodoc:
+    class XPathVisitor #:nodoc:
+
+      def visit_pseudo_class_text(node) #:nodoc:
+        "@type='text'"
+      end
+
+      def visit_pseudo_class_password(node) #:nodoc:
+        "@type='password'"
+      end
+
+    end
+  end
+end

lib/webrat/core/xml/rexml.rb

@@ -0,0 +1,24 @@
+module Webrat
+
+  def self.rexml_document(stringlike)
+    stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
+
+    case stringlike
+    when REXML::Document
+      stringlike.root
+    when REXML::Node, Array
+      stringlike
+    else
+      begin
+        REXML::Document.new(stringlike.to_s).root
+      rescue REXML::ParseException => e
+        if e.message.include?("second root element")
+          REXML::Document.new("<fake-root-element>#{stringlike}</fake-root-element>").root
+        else
+          raise e
+        end
+      end
+    end
+  end
+
+end

lib/webrat/core_extensions/nil_to_param.rb

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

lib/webrat/integrations/merb.rb

@@ -1,10 +0,0 @@
-module Merb #:nodoc:
-  module Test #:nodoc:
-    module RequestHelper #:nodoc:
-      def request(uri, env = {})
-        @_webrat_session ||= Webrat::MerbAdapter.new
-        @_webrat_session.response = @_webrat_session.request(uri, env)
-      end
-    end
-  end
-end

lib/webrat/integrations/rails.rb

@@ -1,25 +0,0 @@
-require "action_controller"
-require "action_controller/integration"
-
-module ActionController #:nodoc:
-  IntegrationTest.class_eval do
-    include Webrat::Methods
-    include Webrat::Matchers
-
-    # The Rails version of within supports passing in a model and Webrat
-    # will apply a scope based on Rails' dom_id for that model.
-    #
-    # Example:
-    #   within User.last do
-    #     click_link "Delete"
-    #   end
-    def within(selector_or_object, &block)
-      if selector_or_object.is_a?(String)
-        super
-      else
-        super('#' + RecordIdentifier.dom_id(selector_or_object), &block)
-      end
-    end
-
-  end
-end

lib/webrat/integrations/rspec-rails.rb

@@ -1,11 +0,0 @@
-# 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 or env.rb:
-#
-#   require 'webrat/integrations/rspec-rails'
-#
-require "nokogiri"
-require "webrat/core/matchers"
-
-Spec::Runner.configure do |config|
-  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
-end

lib/webrat/integrations/selenium.rb

@@ -1,11 +0,0 @@
-require "webrat/selenium"
-
-if defined?(ActionController::IntegrationTest)
-  module ActionController #:nodoc:
-    IntegrationTest.class_eval do
-      include Webrat::Methods
-      include Webrat::Selenium::Methods
-      include Webrat::Selenium::Matchers
-    end
-  end
-end

lib/webrat/mechanize.rb

@@ -4,8 +4,6 @@ module Webrat #:nodoc:
   class MechanizeAdapter #:nodoc:
     extend Forwardable
 
-    Mechanize = WWW::Mechanize if defined?(WWW::Mechanize)
-
     attr_accessor :response
     alias :page :response
 
@@ -22,11 +20,6 @@ module Webrat #:nodoc:
 
     def post(url, data, headers_argument_not_used = nil)
       post_data = data.inject({}) do |memo, param|
-        case param
-        when Hash
-          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 }
@@ -35,7 +28,6 @@ module Webrat #:nodoc:
         end
         memo
       end
-      end
       @response = mechanize.post(url, post_data)
     end
 
@@ -47,16 +39,8 @@ module Webrat #:nodoc:
       @response.code.to_i
     end
 
-    def response_headers
-      @response.header
-    end
-
     def mechanize
-      @mechanize ||= begin
+      @mechanize ||= WWW::Mechanize.new
-        mechanize = Mechanize.new
-        mechanize.redirect_ok = false
-        mechanize
-      end
     end
 
     def_delegators :mechanize, :basic_auth

lib/webrat/merb_adapter.rb

@@ -0,0 +1,82 @@
+require "webrat"
+require "merb-core"
+require "webrat/merb_multipart_support"
+
+module Webrat
+  class MerbAdapter #:nodoc:
+    include Merb::Test::MakeRequest
+
+    # Include Webrat's own version of multipart_post/put because the officially
+    # supported methods in Merb don't perform the request correctly.
+    include MerbMultipartSupport
+
+    attr_accessor :response
+
+    def initialize(context=nil); end
+
+    def get(url, data, headers = nil)
+      do_request(url, data, headers, "GET")
+    end
+
+    def post(url, data, headers = nil)
+      do_request(url, data, headers, "POST")
+    end
+
+    def put(url, data, headers = nil)
+      do_request(url, data, headers, "PUT")
+    end
+
+    def delete(url, data, headers = nil)
+      do_request(url, data, headers, "DELETE")
+    end
+
+    def response_body
+      @response.body.to_s
+    end
+
+    def response_code
+      @response.status
+    end
+
+    def do_request(url, data, headers, method)
+      if method == "POST" && has_file?(data)
+        @response = multipart_post(url, data, :headers => headers)
+
+      elsif method == "PUT" && has_file?(data)
+        @response = multipart_put(url, data, :headers => headers)
+
+      else
+        @response = request(url,
+          :params => (data && data.any?) ? data : nil,
+          :headers => headers,
+          :method => method)
+      end
+    end
+
+    protected
+
+      # Recursively search the data for a file attachment.
+      def has_file?(data)
+        data.each do |key, value|
+          if value.is_a?(Hash)
+            return has_file?(value)
+          else
+            return true if value.is_a?(File)
+          end
+        end
+        return false
+      end
+
+  end
+end
+
+module Merb #:nodoc:
+  module Test #:nodoc:
+    module RequestHelper #:nodoc:
+      def request(uri, env = {})
+        @_webrat_session ||= Webrat::MerbAdapter.new
+        @_webrat_session.response = @_webrat_session.request(uri, env)
+      end
+    end
+  end
+end

lib/webrat/merb_multipart_support.rb

@@ -0,0 +1,27 @@
+module Webrat
+
+  # These methods are copied from merb-core/two-oh.rb which defines new
+  # multipart_post and multipart_put methods for Merb::Test::MultipartRequestHelper.
+  # We can't require two-oh.rb because it alters Merb's own behavior, causing
+  # failing specs in Merb when Webrat is required.
+  module MerbMultipartSupport
+    def multipart_request(path, params = {}, env = {})
+      multipart = Merb::Test::MultipartRequestHelper::Post.new(params)
+      body, head = multipart.to_multipart
+      env["CONTENT_TYPE"] = head
+      env["CONTENT_LENGTH"] = body.size
+      env[:input] = StringIO.new(body)
+      request(path, env)
+    end
+
+    def multipart_post(path, params = {}, env = {})
+      env[:method] = "POST"
+      multipart_request(path, params, env)
+    end
+
+    def multipart_put(path, params = {}, env = {}, &block)
+      env[:method] = "PUT"
+      multipart_request(path, params, env)
+    end
+  end
+end

lib/webrat/rack.rb

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

lib/webrat/rails.rb

@@ -1,5 +1,4 @@
-require "webrat/integrations/rails"
+require "webrat"
-require "action_controller/record_identifier"
 
 module Webrat
   class RailsAdapter #:nodoc:
@@ -11,6 +10,29 @@ module Webrat
       @integration_session = session
     end
 
+    # The Rails version of within supports passing in a model and Webrat
+    # will apply a scope based on Rails' dom_id for that model.
+    #
+    # Example:
+    #   within User.last do
+    #     click_link "Delete"
+    #   end
+    def within(selector_or_object, &block)
+      if selector_or_object.is_a?(String)
+        super
+      else
+        super('#' + dom_id(selector_or_object), &block)
+      end
+    end
+
+    def doc_root
+      File.expand_path(File.join(RAILS_ROOT, 'public'))
+    end
+
+    def saved_page_dir
+      File.expand_path(File.join(RAILS_ROOT, "tmp"))
+    end
+
     def get(url, data, headers = nil)
       do_request(:get, url, data, headers)
     end
@@ -35,10 +57,6 @@ 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
@@ -75,3 +93,10 @@ module Webrat
     end
   end
 end
+
+module ActionController #:nodoc:
+  IntegrationTest.class_eval do
+    include Webrat::Methods
+    include Webrat::Matchers
+  end
+end

lib/webrat/rspec-rails.rb

@@ -1,2 +1,10 @@
-warn("Requiring 'webrat/rspec-rails' is deprecated. Please require 'webrat/integrations/rspec-rails' instead")
+# Supports using the matchers in controller, helper, and view specs if you're
-require "webrat/integrations/rspec-rails"
+# using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
+#
+#   require 'webrat/rspec-rails'
+#
+require "webrat/core/matchers"
+
+Spec::Runner.configure do |config|
+  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
+end

lib/webrat/selenium.rb

@@ -68,3 +68,13 @@ module Webrat
     end
   end
 end
+
+if defined?(ActionController::IntegrationTest)
+  module ActionController #:nodoc:
+    IntegrationTest.class_eval do
+      include Webrat::Methods
+      include Webrat::Selenium::Methods
+      include Webrat::Selenium::Matchers
+    end
+  end
+end

lib/webrat/selenium/location_strategy_javascript/label.js

@@ -1,48 +1,16 @@
-// Credit to: http://simonwillison.net/2006/Jan/20/escape/
-RegExp.escape = function(text) {
-  if (!arguments.callee.sRE) {
-    var specials = [
-      '/', '.', '*', '+', '?', '|',
-      '(', ')', '[', ']', '{', '}', '\\'
-    ];
-    arguments.callee.sRE = new RegExp(
-      '(\\' + specials.join('|\\') + ')', 'g'
-    );
-  }
-  return text.replace(arguments.callee.sRE, '\\$1');
-};
-
 var allLabels = inDocument.getElementsByTagName("label");
-var regExp = new RegExp('^\\W*' + RegExp.escape(locator) + '(\\b|$)', 'i');
-
 var candidateLabels = $A(allLabels).select(function(candidateLabel){
+  var regExp = new RegExp('^' + locator + '\\b', 'i');
   var labelText = getText(candidateLabel).strip();
   return (labelText.search(regExp) >= 0);
 });
-
 if (candidateLabels.length == 0) {
   return null;      
 }
-
+candidateLabels = candidateLabels.sortBy(function(s) { return s.length * -1; }); //reverse length sort
-//reverse length sort
-candidateLabels = candidateLabels.sortBy(function(s) {
-  return s.length * -1;
-});
-
 var locatedLabel = candidateLabels.first();
-var labelFor = null;
+var labelFor = locatedLabel.getAttribute('for');
-
-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]
+  return locatedLabel.firstChild; //TODO: should find the first form field, not just any node
-    || locatedLabel.getElementsByTagName('input')[0]
-    || locatedLabel.getElementsByTagName('textarea')[0]
-    || locatedLabel.getElementsByTagName('select')[0];
 }
-
 return selenium.browserbot.locationStrategies['id'].call(this, labelFor, inDocument, inWindow);

lib/webrat/selenium/location_strategy_javascript/webrat.js

@@ -1,5 +1,4 @@
 var locationStrategies = selenium.browserbot.locationStrategies;
-
 return locationStrategies['id'].call(this, locator, inDocument, inWindow)
         || locationStrategies['name'].call(this, locator, inDocument, inWindow)
         || locationStrategies['label'].call(this, locator, inDocument, inWindow)

lib/webrat/selenium/location_strategy_javascript/webratlink.js

@@ -1,32 +1,12 @@
 var links = inDocument.getElementsByTagName('a');
-
 var candidateLinks = $A(links).select(function(candidateLink) {
-  var textMatched = false;
+  var textMatched = PatternMatcher.matches(locator, getText(candidateLink));
-  var titleMatched = false;
+  var idMatched = PatternMatcher.matches(locator, candidateLink.id);
-  var idMatched = false;
+  var titleMatched = PatternMatcher.matches(locator, candidateLink.title);
-
-  if (getText(candidateLink).toLowerCase().indexOf(locator.toLowerCase()) != -1) {
-    textMatched = true;
-  }
-
-  if (candidateLink.title.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
-    titleMatched = true;
-  }
-
-  if (candidateLink.id.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
-    idMatched = true;
-  }
-
   return textMatched || idMatched || titleMatched;
 });
-
 if (candidateLinks.length == 0) {
   return null;
 }
-
+candidateLinks = candidateLinks.sortBy(function(s) { return s.length * -1; }); //reverse length sort
-//reverse length sort
-candidateLinks = candidateLinks.sortBy(function(s) {
-  return s.length * -1;
-});
-
 return candidateLinks.first();

lib/webrat/selenium/matchers/have_content.rb

@@ -7,33 +7,29 @@ module Webrat
         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
-        rescue Webrat::TimeoutError => e
+          rescue Webrat::TimeoutError
-          @error_message = e.message
-          false
-        end
-
-        def does_not_match?(response)
-          response.session.wait_for do
-            !response.selenium.is_text_present(text_finder)
-          end
-        rescue Webrat::TimeoutError => e
-          @error_message = e.message
             false
         end
 
         # ==== Returns
         # String:: The failure message.
         def failure_message
-          "expected the response to #{content_message}:\n#{@error_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 response to not #{content_message}"
+          "expected the following element's content to not #{content_message}:\n#{@element}"
         end
 
         def content_message
@@ -44,14 +40,6 @@ 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

lib/webrat/selenium/matchers/have_selector.rb

@@ -14,14 +14,6 @@ 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

lib/webrat/selenium/matchers/have_xpath.rb

@@ -14,14 +14,6 @@ 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

lib/webrat/selenium/selenium_rc_server.rb

@@ -31,13 +31,10 @@ 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,
-                                                                       server_options)
+                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
-
         @remote_control.jar_file = jar_path
 
         return @remote_control
@@ -64,7 +61,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  => 45 # seconds
+            :timeout  => 15 # seconds
         end
       end
 

lib/webrat/selenium/selenium_session.rb

@@ -3,13 +3,6 @@ require "webrat/selenium/selenium_rc_server"
 require "webrat/selenium/application_server_factory"
 require "webrat/selenium/application_servers/base"
 
-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
   end
@@ -84,12 +77,7 @@ module Webrat
     webrat_deprecate :clicks_button, :click_button
 
     def click_link(link_text_or_regexp, options = {})
-      if link_text_or_regexp.is_a?(Regexp)
+      pattern = adjust_if_regexp(link_text_or_regexp)
-        pattern = "evalregex:#{link_text_or_regexp.inspect}"
-      else
-        pattern = link_text_or_regexp.to_s
-      end
-
       locator = "webratlink=#{pattern}"
       selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
@@ -174,19 +162,7 @@ module Webrat
         sleep 0.25
       end
 
-      error_message = "#{message} (after #{timeout} sec)"
+      raise Webrat::TimeoutError.new(message + " (after #{timeout} sec)")
-      
-      if $browser && Webrat.configuration.selenium_verbose_output
-        error_message += <<-EOS
-
-
-HTML of the page was:
-
-#{selenium.get_html_source}"
-EOS
-      end
-
-      raise Webrat::TimeoutError.new(error_message)
       true
     end
 
@@ -200,9 +176,9 @@ EOS
 
 
     def save_and_open_screengrab
-      return unless File.exist?(Webrat.configuration.saved_pages_dir)
+      return unless File.exist?(saved_page_dir)
 
-      filename = "#{Webrat.configuration.saved_pages_dir}/webrat-#{Time.now.to_i}.png"
+      filename = "#{saved_page_dir}/webrat-#{Time.now.to_i}.png"
 
       if $browser.chrome_backend?
         $browser.capture_entire_page_screenshot(filename, '')
@@ -237,7 +213,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_for_selenium}")
+      Webrat.configuration.selenium_server_port, Webrat.configuration.selenium_browser_key, "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port}")
       $browser.set_speed(0) unless Webrat.configuration.selenium_server_address
 
       at_exit do

lib/webrat/sinatra.rb

@@ -1,3 +1,5 @@
+require "webrat/rack"
+
 module Webrat
   class SinatraAdapter < RackAdapter
     def initialize(context)

spec/fakes/test_adapter.rb

@@ -10,12 +10,16 @@ module Webrat #:nodoc:
     def initialize(*args)
     end
 
+    def doc_root
+      File.expand_path(File.join(".", "public"))
+    end
+
     def response
       @response ||= Object.new
     end
 
     def response_code
-      @response_code ||= 200
+      @response_code || 200
     end
 
     def get(url, data, headers = nil)

spec/integration/mechanize/sample_app.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "sinatra/base"
 
 class SampleApp < Sinatra::Default
@@ -16,20 +17,4 @@ 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

spec/integration/mechanize/spec/mechanize_spec.rb

@@ -12,15 +12,7 @@ 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")

spec/integration/mechanize/spec/spec_helper.rb

@@ -21,9 +21,7 @@ Spec::Runner.configure do |config|
   end
 
   config.after :suite do
-    if File.exists?("rack.pid")
     Process.kill("TERM", File.read("rack.pid").to_i)
   end
 end
-end
 

spec/integration/rack/app.rb

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

spec/integration/rack/test/helper.rb

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

spec/integration/rack/test/webrat_rack_test.rb

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

spec/integration/rails/app/controllers/webrat_controller.rb

@@ -40,7 +40,4 @@ class WebratController < ApplicationController
     render :text => params.to_json
   end
 
-  def within
-  end
-
 end

spec/integration/rails/app/views/buttons/show.html.erb

@@ -1,9 +1,11 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag "/buttons" do %>
+  <input type="button" id="input_button_id" value="input_button_value" />
   <input type="submit" id="input_submit_id" value="input_submit_value" />
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="" />
 
+  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

spec/integration/rails/app/views/webrat/buttons.html.erb

@@ -1,9 +1,11 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag submit_path do %>
+  <input type="button" id="input_button_id" value="input_button_value">
   <input type="submit" id="input_submit_id" value="input_submit_value">
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="">
 
+  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

spec/integration/rails/app/views/webrat/within.html.erb

@@ -1,3 +0,0 @@
-<div id="new_object">
-  <a href="/">Edit Object</a>
-</div>

spec/integration/rails/config/environment.rb

@@ -1,4 +1,4 @@
-# RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 

spec/integration/rails/config/routes.rb

@@ -12,7 +12,6 @@ ActionController::Routing::Routes.draw do |map|
     webrat.before_redirect_form     "/before_redirect_form",    :action => "before_redirect_form"
     webrat.redirect_to_show_params  "/redirect_to_show_params", :action => "redirect_to_show_params"
     webrat.show_params              "/show_params",             :action => "show_params"
-    webrat.within                   "/within",                  :action => "within"
 
     webrat.root :action => "form"
   end

spec/integration/rails/test/integration/button_click_test.rb

@@ -1,66 +1,80 @@
 require 'test_helper'
 
 class ButtonClickTest < ActionController::IntegrationTest
+  # <button type="button" ...>
+  test "should click button with type button by id" do
+    visit buttons_path
+    click_button "button_button_id"
+  end
+  test "should click button with type button by value" do
+    visit buttons_path
+    click_button "button_button_value"
+  end
+  test "should click button with type button by html" do
+    visit buttons_path
+    click_button "button_button_text"
+  end
+
   # <button type="submit" ...>
   test "should click button with type submit by id" do
     visit buttons_path
     click_button "button_submit_id"
-    assert_contain "success"
   end
   test "should click button with type submit by value" do
     visit buttons_path
     click_button "button_submit_value"
-    assert_contain "success"
   end
   test "should click button with type submit by html" do
     visit buttons_path
     click_button "button_submit_text"
-    assert_contain "success"
   end
 
   # <button type="image" ...>
   test "should click button with type image by id" do
     visit buttons_path
     click_button "button_image_id"
-    assert_contain "success"
   end
   test "should click button with type image by value" do
     visit buttons_path
     click_button "button_image_value"
-    assert_contain "success"
   end
   test "should click button with type image by html" do
     visit buttons_path
     click_button "button_image_text"
-    assert_contain "success"
+  end
+
+  # <input type="button" ...>
+  test "should click image with type button by id" do
+    visit buttons_path
+    click_button "input_button_id"
+  end
+  test "should click input with type button by value" do
+    visit buttons_path
+    click_button "input_button_value"
   end
 
   # <input type="submit" ...>
   test "should click input with type submit by id" do
     visit buttons_path
     click_button "input_submit_id"
-    assert_contain "success"
   end
   test "should click input with type submit by value" do
     visit buttons_path
     click_button "input_submit_value"
-    assert_contain "success"
   end
 
   # <input type="image" ...>
   test "should click input with type image by id" do
     visit buttons_path
     click_button "input_image_id"
-    assert_contain "success"
   end
   test "should click input with type image by value" do
     visit buttons_path
     click_button "input_image_value"
-    assert_contain "success"
   end
   test "should click input with type image by alt" do
     visit buttons_path
     click_button "input_image_alt"
-    assert_contain "success"
   end
+
 end

spec/integration/rails/test/integration/webrat_test.rb

@@ -22,15 +22,12 @@ class WebratTest < ActionController::IntegrationTest
     check "TOS"
     select "January"
     click_button "Test"
-    assert_contain "OK"
   end
 
   test "should check the value of a field" do
-    webrat.simulate do
     visit "/"
     assert field_labeled("Prefilled").value, "text"
   end
-  end
 
   test "should not carry params through redirects" do
     visit before_redirect_form_path
@@ -46,27 +43,21 @@ class WebratTest < ActionController::IntegrationTest
 
   test "should follow internal redirects" do
     visit internal_redirect_path
-    webrat.simulate do
     assert !response.redirect?
-    end
     assert response.body.include?("OK")
   end
 
   test "should not follow external redirects" do
-    webrat.simulate do
     visit external_redirect_path
     assert response.redirect?
   end
-  end
 
   test "should recognize the host header to follow redirects properly" do
-    webrat.simulate do
     header "Host", "foo.bar"
     visit host_redirect_path
     assert !response.redirect?
     assert response.body.include?("OK")
   end
-  end
 
   test "should click link by text" do
     visit internal_redirect_path
@@ -90,23 +81,6 @@ class WebratTest < ActionController::IntegrationTest
     assert_have_selector "h1"
   end
 
-  test "should accept an Object argument to #within and translate using dom_id" do
-    webrat.simulate do
-      visit within_path
-
-      object = Object.new
-      def object.id
-        nil
-      end
-
-      within(object) do
-        click_link "Edit Object"
-      end
-
-      assert_contain "Webrat Form"
-    end
-  end
-
   # Firefox detects and prevents infinite redirects under Selenium
   unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium'
      test "should detect infinite redirects" do

spec/integration/rails/test/test_helper.rb

@@ -12,7 +12,6 @@ require "webrat"
 
 Webrat.configure do |config|
   config.mode = ENV['WEBRAT_INTEGRATION_MODE'].to_sym
-  config.selenium_browser_key = '*safari'
 end
 
 ActionController::Base.class_eval do

spec/integration/sinatra/classic_app.rb

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

spec/integration/sinatra/modular_app.rb

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

spec/integration/sinatra/test/classic_app_test.rb

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

spec/integration/sinatra/test/test_helper.rb

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

spec/private/core/configuration_spec.rb

@@ -2,6 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Webrat::Configuration do
   
+  Spec::Matchers.define :parse_with_nokogiri do
+    match do |config|
+      config.parse_with_nokogiri?
+    end
+  end
+  
   Spec::Matchers.define :open_error_files do
     match do |config|
       config.open_error_files?
@@ -12,6 +18,11 @@ describe Webrat::Configuration do
     Webrat.configuration.should respond_to(:mode)
   end
 
+  it "should use Nokogiri as the parser by default" do
+    config = Webrat::Configuration.new
+    config.should parse_with_nokogiri
+  end
+
   it "should open error files by default" do
     config = Webrat::Configuration.new
     config.should open_error_files
@@ -45,6 +56,24 @@ describe Webrat::Configuration do
     config.selenium_server_port.should == 1234
   end
 
+  [:rails,
+  :selenium,
+  :rack,
+  :sinatra,
+  :mechanize].each do |mode|
+    it "should require correct lib when in #{mode} mode" do
+      config = Webrat::Configuration.new
+      config.should_receive(:require).with("webrat/#{mode}")
+      config.mode = mode
+    end
+  end
+
+  it "should require merb_adapter when in merb mode" do
+    config = Webrat::Configuration.new
+    config.should_receive(:require).with("webrat/merb_adapter")
+    config.mode = :merb
+  end
+
   describe "Selenium" do
     before :each do
       @config = Webrat::Configuration.new

spec/private/core/field_spec.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 module Webrat
   describe Field do
+    unless RUBY_PLATFORM =~ /java/
       it "should have nice inspect output" do
         html = <<-HTML
           <html>
@@ -9,9 +10,10 @@ module Webrat
           </html>
         HTML
 
-      element = Webrat::XML.document(html).css("input").first
+        element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
         checkbox = CheckboxField.new(nil, element)
-      checkbox.inspect.should =~ /^#<Webrat::CheckboxField @element=/
+        checkbox.inspect.should =~ /#<Webrat::CheckboxField @element=<input type=['"]checkbox['"] checked(=['"]checked['"])?\/?>>/
+      end
     end
   end
 
@@ -23,7 +25,7 @@ module Webrat
         </html>
       HTML
 
-      element = Webrat::XML.document(html).css("input").first
+      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
       checkbox = CheckboxField.new(nil, element)
       checkbox.should be_checked
     end
@@ -35,7 +37,7 @@ module Webrat
         </html>
       HTML
 
-      element = Webrat::XML.document(html).css("input").first
+      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
       checkbox = CheckboxField.new(nil, element)
       checkbox.should_not be_checked
     end
@@ -49,7 +51,7 @@ module Webrat
         </html>
       HTML
 
-      element = Webrat::XML.document(html).css("input").first
+      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
       radio_button = RadioField.new(nil, element)
       radio_button.should be_checked
     end
@@ -59,7 +61,7 @@ module Webrat
         <html><input type='radio' /></html>
       HTML
 
-      element = Webrat::XML.document(html).css("input").first
+      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
       radio_button = RadioField.new(nil, element)
       radio_button.should_not be_checked
     end
@@ -75,9 +77,9 @@ module Webrat
         </html>
       HTML
 
-      element    = Webrat::XML.document(html).css('input').first
+      element    = Webrat::XML.css_search(Webrat::XML.document(html), 'input').first
       text_field = TextField.new(nil, element)
-      text_field.to_query_string.should == 'email=user@example.com'
+      text_field.to_param.should == { 'email' => 'user@example.com' }
     end
   end
 end

spec/private/core/form_spec.rb

@@ -1,69 +0,0 @@
-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
-
-  it "should correctly construct a query string" do
-    Webrat.configuration.mode = :mechanize
-
-    with_html <<-HTML
-      <html>
-        <form method="get" action="/search">
-          <input type="text" name="query" value="my-query" />
-          <input type="submit" />
-        </form>
-      </html>
-    HTML
-
-    params = { "query" => "my-query" }
-
-    webrat_session.should_receive(:get).with("/search", params)
-    click_button
-  end
-end

spec/private/core/session_spec.rb

@@ -2,6 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Webrat::Session do
 
+  it "should not have a doc_root" do
+    session = Webrat::Session.new
+    session.doc_root.should be_nil
+  end
+
   it "should expose the current_dom" do
     session = Webrat::Session.new
 
@@ -106,6 +111,24 @@ describe Webrat::Session do
       webrat_session = Webrat::Session.new
     end
 
+    it "should return true if the last response was a redirect and Fixnum#/ returns a Rational" do
+      # This happens if the ruby-units gem has been required
+      Fixnum.class_eval do
+        alias_method :original_divide, "/".to_sym
+
+        def /(other)
+          Rational(self, other)
+        end
+      end
+
+      webrat_session.stub!(:response_code => 301)
+      webrat_session.redirect?.should be_true
+
+      Fixnum.class_eval do
+        alias_method "/".to_sym, :original_divide
+      end
+    end
+
     it "should return true if the last response was a redirect" do
       webrat_session.stub!(:response_code => 301)
       webrat_session.redirect?.should be_true
@@ -115,11 +138,6 @@ describe Webrat::Session do
       webrat_session.stub!(:response_code => 200)
       webrat_session.redirect?.should be_false
     end
-
-    it "should return false if the last response was a 304 Not Modified" do
-      webrat_session.stub!(:response_code => 304)
-      webrat_session.redirect?.should be_false
-    end
   end
 
   describe "#internal_redirect?" do

spec/private/mechanize/mechanize_adapter_spec.rb

@@ -1,9 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
+require "webrat/mechanize"
+
 describe Webrat::MechanizeAdapter do
-
-  Mechanize = WWW::Mechanize if defined?(WWW::Mechanize)
-
   before :each do
     Webrat.configuration.mode = :mechanize
   end
@@ -12,13 +11,6 @@ describe Webrat::MechanizeAdapter do
     @mech = Webrat::MechanizeAdapter.new
   end
 
-  describe "mechanize" do
-    it "should disable the following of redirects on the mechanize instance" do
-      mech = @mech.mechanize
-      mech.redirect_ok.should be_false
-    end
-  end
-
   describe "post" do
     def url
       'http://test.host/users'
@@ -34,8 +26,7 @@ describe Webrat::MechanizeAdapter do
 
     it "should flatten model post data" do
       mechanize = mock(:mechanize)
-      mechanize.stub!(:redirect_ok=)
+      WWW::Mechanize.stub!(:new => mechanize)
-      Mechanize.stub!(:new => mechanize)
       mechanize.should_receive(:post).with(url, flattened_data)
       Webrat::MechanizeAdapter.new.post(url, data)
     end
@@ -81,16 +72,4 @@ describe Webrat::MechanizeAdapter do
       @session.absolute_url(relative_url).should == 'https://test.host/wilma'
     end
   end
-
-  describe "response_headers" do
-    it "should return the Headers object from the response" do
-      mech = @mech.mechanize
-      resp = mock('Mechanize::File')
-      hdr = Mechanize::Headers.new
-      resp.should_receive(:header).and_return(hdr)
-      mech.stub!(:get).and_return(resp)
-      @mech.get('/', nil)
-      @mech.response_headers.should == hdr
-    end
-  end
 end

spec/private/merb/attaches_file_spec.rb

@@ -0,0 +1,93 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "attach_file with merb" do
+  before do
+    Webrat.configuration.mode = :merb
+    @filename = __FILE__
+  end
+
+  it "should fail if no file field found" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/widgets">
+      </form>
+      </html>
+    HTML
+    lambda { attach_file("Doc", "/some/path") }.should raise_error(Webrat::NotFoundError)
+  end
+
+  it "should submit empty strings for blank file fields" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/widgets">
+        <input type="file" id="widget_file" name="widget[file]" />
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/widgets", { "widget" => { "file" => "" } })
+    click_button
+  end
+
+  it "should submit the attached file" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/widgets">
+        <label for="widget_file">Document</label>
+        <input type="file" id="widget_file" name="widget[file]" />
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with { |path, params|
+      path.should == "/widgets"
+      params.should have_key("widget")
+      params["widget"].should have_key("file")
+      params["widget"]["file"].should be_an_instance_of(File)
+      params["widget"]["file"].path.should == @filename
+    }
+    attach_file "Document", @filename
+    click_button
+  end
+
+  it "should support collections" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/widgets">
+        <label for="widget_file1">Document</label>
+        <input type="file" id="widget_file1" name="widget[files][]" />
+        <label for="widget_file2">Spreadsheet</label>
+        <input type="file" id="widget_file2" name="widget[files][]" />
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with { |path, params|
+      path.should == "/widgets"
+      params.should have_key("widget")
+      params["widget"].should have_key("files")
+      params["widget"]["files"][0].should be_an_instance_of(File)
+      params["widget"]["files"][0].path.should == @filename
+      params["widget"]["files"][1].should be_an_instance_of(File)
+      params["widget"]["files"][1].path.should == @filename
+    }
+    attach_file "Document", @filename
+    attach_file "Spreadsheet", @filename
+    click_button
+  end
+
+  xit "should allow the content type to be specified" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/widgets">
+        <label for="person_picture">Picture</label>
+        <input type="file" id="person_picture" name="person[picture]" />
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    ActionController::TestUploadedFile.should_receive(:new).with(@filename, "image/png").any_number_of_times
+    attach_file "Picture", @filename, "image/png"
+    click_button
+  end
+end

spec/private/merb/merb_adapter_spec.rb

@@ -0,0 +1,61 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+require "webrat/merb"
+
+describe Webrat::MerbAdapter do
+  it "should not pass empty params if data is and empty hash" do
+    session = Webrat::MerbAdapter.new
+    response = OpenStruct.new
+    response.status = 200
+    session.should_receive(:request).with('url', {:params=> nil, :method=>"GET", :headers=>nil}).and_return(response)
+    session.get('url', {}, nil)
+  end
+
+  %w{post put delete}.each do |request_method|
+    it "should call do request with method #{request_method.upcase} for a #{request_method} call" do
+      session = Webrat::MerbAdapter.new
+      response = OpenStruct.new
+      response.status = 200
+
+      session.should_receive(:request).with('url', {:params=>nil, :method=>request_method.upcase, :headers=>nil}).and_return(response)
+      session.send(request_method, 'url', {}, nil)
+    end
+  end
+
+  %w{post put}.each do |request_method|
+    it "should call do request with method #{request_method.upcase} with a file attachment" do
+      session = Webrat::MerbAdapter.new
+      response = OpenStruct.new
+      response.status = 200
+
+      file = File.new(__FILE__)
+      session.should_receive(:request).with { |path, env|
+        path.should == "url"
+        env[:method].should == request_method.upcase
+        env[:headers].should be_nil
+        env[:input].should be_an_instance_of(StringIO)
+        env["CONTENT_LENGTH"].should be_an_instance_of(Fixnum)
+        env["CONTENT_TYPE"].should match(/multipart.*boundary/)
+      }.and_return(response)
+      session.send(request_method, 'url', { :file => file }, nil)
+    end
+  end
+
+  context "a session with a response" do
+    before do
+      @session = Webrat::MerbAdapter.new
+      @response = OpenStruct.new
+      @response.status = 200
+      @response.body = 'test response'
+      @session.instance_variable_set(:@response, @response)
+    end
+
+    it "should return body of a request as a response_body" do
+      @session.response_body.should == @response.body
+    end
+
+    it "should return status of a request as a response_code" do
+      @session.response_code.should == @response.status
+    end
+  end
+end

spec/private/nokogiri_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
-# if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
+if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
   describe "Nokogiri Extension" do
     include Webrat::Matchers
 
@@ -74,4 +74,4 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
       end
     end
   end
-# end
+end

spec/private/rails/attaches_file_spec.rb

@@ -78,37 +78,4 @@ describe "attach_file" do
     attach_file "Picture", @filename, "image/png"
     click_button
   end
-
-  it "should support nested attributes" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/albums">
-        <label for="photo_file1">Photo</label>
-        <input type="file" id="photo_file1" name="album[photos_attributes][][image]" />
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-    webrat_session.should_receive(:post).with("/albums", { "album" => { "photos_attributes" => [{"image" => @uploaded_file}] } })
-    attach_file "Photo", @filename
-    click_button
-  end
-
-  it "should support nested attributes with multiple files" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/albums">
-        <label for="photo_file1">Photo 1</label>
-        <input type="file" id="photo_file1" name="album[photos_attributes][][image]" />
-        <label for="photo_file2">Photo 2</label>
-        <input type="file" id="photo_file2" name="album[photos_attributes][][image]" />
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-    webrat_session.should_receive(:post).with("/albums", { "album" => { "photos_attributes" => [{"image" => @uploaded_file}, {"image" => @uploaded_file}] } })
-    attach_file "Photo 1", @filename
-    attach_file "Photo 2", @filename
-    click_button
-  end
 end

spec/private/rails/rails_adapter_spec.rb

@@ -1,5 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
+require "action_controller"
+require "webrat/rails"
+
 describe Webrat::RailsAdapter do
   before :each do
     Webrat.configuration.mode = :rails
@@ -76,4 +79,35 @@ describe Webrat::RailsAdapter do
     end
   end
 
+  it "should provide a saved_page_dir" do
+    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:saved_page_dir)
+  end
+
+  it "should provide a doc_root" do
+    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
+  end
+
+  it "should accept an ActiveRecord argument to #within and translate to a selector using dom_id" do
+    pending "Move this to spec/public/within_spec.rb"
+
+    body = <<-HTML
+      <a href="/page1">Edit</a>
+      <div id="new_object">
+        <a href="/page2">Edit</a>
+      </div>
+    HTML
+
+    response = mock("response", :body => body, :headers => {}, :code => 200)
+    @integration_session.stub!(:response => response)
+    @integration_session.should_receive(:get).with("/page2", {}, nil)
+
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
+
+    object = Object.new
+    object.stub!(:id => nil)
+
+    rails_session.within(object) do
+      rails_session.click_link 'Edit'
+    end
+  end
 end

spec/public/basic_auth_spec.rb

@@ -6,7 +6,7 @@ describe "Basic Auth HTTP headers" do
   end
 
   it "should be present in visit" do
-    webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ="})
+    webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ=\n"})
     visit("/")
   end
 
@@ -18,18 +18,7 @@ describe "Basic Auth HTTP headers" do
       </form>
       </html>
     HTML
-    webrat_session.should_receive(:post).with("/form1", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ="})
+    webrat_session.should_receive(:post).with("/form1", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ=\n"})
     click_button
   end
-
-  context "with long username and password combination" do
-    before do
-      basic_auth('user', 'secret1234567890123456789012345678901234567890123456789012345678901234567890')
-    end
-
-    it "should be present, without new lines, in visit" do
-      webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkw"})
-      visit("/")
-    end
-  end
 end

spec/public/click_button_spec.rb

@@ -331,6 +331,7 @@ describe "click_button" do
   end
 
   it "should properly handle HTML entities in textarea default values" do
+    pending "needs bug fix" do
       with_html <<-HTML
         <html>
         <form method="post" action="/posts">
@@ -342,6 +343,7 @@ describe "click_button" do
       webrat_session.should_receive(:post).with("/posts", "post" => {"body" => "Peanut butter & jelly"})
       click_button
     end
+  end
 
   it "should send default selected option value from select" do
     with_html <<-HTML

spec/public/click_link_spec.rb

@@ -144,27 +144,6 @@ describe "click_link" do
     click_link "Posts"
   end
 
-  it "should click rails 2.3.4 javascript links with authenticity tokens" do
-    with_html <<-HTML
-      <html>
-      <a href="/posts" onclick="var f = document.createElement('form');
-        f.style.display = 'none';
-        this.parentNode.appendChild(f);
-        f.method = 'POST';
-        f.action = this.href;
-        var s = document.createElement('input');
-        s.setAttribute('type', 'hidden');
-        s.setAttribute('name', 'authenticity_token');
-        s.setAttribute('value', 'aa79cb354597a60a3786e7e291ed4f74d77d3a62=/$a');
-        f.appendChild(s);
-        f.submit();
-        return false;">Posts</a>
-      </html>
-    HTML
-    webrat_session.should_receive(:post).with("/posts", "authenticity_token" => "aa79cb354597a60a3786e7e291ed4f74d77d3a62=/$a")
-    click_link "Posts"
-  end
-
   it "should click rails javascript delete links" do
     with_html <<-HTML
       <html>

spec/public/fill_in_spec.rb

@@ -16,21 +16,6 @@ describe "fill_in" do
     click_button
   end
 
-  it "should support multiline values" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <label for="user_text">User Text</label>
-        <textarea id="user_text" name="user[text]"></textarea>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-    webrat_session.should_receive(:post).with("/login", "user" => {"text" => "One\nTwo"})
-    fill_in "User Text", :with => "One\nTwo"
-    click_button
-  end
-
   it "should work with password fields" do
     with_html <<-HTML
       <html>

spec/public/matchers/contain_spec.rb

@@ -3,6 +3,21 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 describe "contain" do
   include Webrat::Matchers
 
+  before(:each) do
+    @body = <<-HTML
+      <div id='main'>
+        <div class='inner'>hello, world!</div>
+        <h2>Welcome "Bryan"</h2>
+        <h3>Welcome 'Bryan'</h3>
+        <h4>Welcome 'Bryan"</h4>
+        <ul>
+          <li>First</li>
+          <li>Second</li>
+        </ul>
+      </div>
+    HTML
+  end
+
   before(:each) do
     @body = <<-EOF
       <div id='main'>
@@ -19,14 +34,6 @@ describe "contain" do
     it "should call element#matches? when the argument is a regular expression" do
       @body.should contain(/hello, world/)
     end
-
-    it "should treat newlines as spaces" do
-      "<div>it takes\ndifferent strokes</div>".should contain("it takes different strokes")
-    end
-
-    it "should multiple spaces as a single space" do
-      "<div>it takes  different strokes</div>".should contain("it takes different strokes")
-    end
   end
 
   describe "asserts for contains," do

spec/public/matchers/have_selector_spec.rb

@@ -61,10 +61,6 @@ describe "have_selector" do
         @body.should have_selector("li", :count => 4)
       }.should raise_error(Spec::Expectations::ExpectationNotMetError)
     end
-
-    it "should convert a string to an integer for count" do
-      @body.should have_selector("li", :count => "3")
-    end
   end
 
   describe "specifying nested elements" do

spec/public/matchers/have_xpath_spec.rb

@@ -89,12 +89,6 @@ describe "have_xpath" do
     }.should raise_error(Spec::Expectations::ExpectationNotMetError)
   end
 
-  it "should match negative expectations in the block" do
-    @body.should have_xpath("//div") do |node|
-      node.should_not have_xpath("//div[@id='main']")
-    end
-  end
-
   it "should match descendants of the matched elements in the block" do
     @body.should have_xpath("//ul") do |node|
       node.should have_xpath("//a[@href='http://example.org']")

spec/public/save_and_open_spec.rb

@@ -22,13 +22,30 @@ describe "save_and_open_page" do
     Launchy::Browser.stub!(:run)
 
     @file_handle = mock("file handle")
-    File.stub!(:open).and_yield(@file_handle)
+    File.stub!(:open).with(filename, 'w').and_yield(@file_handle)
     @file_handle.stub!(:write)
   end
 
-  it "should save pages to the directory configured" do
+  it "should rewrite css rules" do
-    Webrat.configuration.stub!(:saved_pages_dir => "path/to/dir")
+    @file_handle.should_receive(:write) do |html|
-    File.should_receive(:open).with("path/to/dir/webrat-1234.html", "w").and_yield(@file_handle)
+      html.should =~ %r|"#{webrat_session.doc_root}/stylesheets/foo.css"|s
+    end
+
+    save_and_open_page
+  end
+
+  it "should rewrite image paths with double quotes" do
+    @file_handle.should_receive(:write) do |html|
+      html.should =~ %r|"#{webrat_session.doc_root}/images/bar.png"|s
+    end
+
+    save_and_open_page
+  end
+
+  it "should rewrite image paths with single quotes" do
+    @file_handle.should_receive(:write) do |html|
+      html.should =~ %r|'#{webrat_session.doc_root}/images/foo.png'|s
+    end
 
     save_and_open_page
   end
@@ -46,4 +63,8 @@ describe "save_and_open_page" do
     end.should_not raise_error
   end
 
+  def filename
+    File.expand_path("./webrat-#{Time.now}.html")
+  end
+
 end

spec/public/select_spec.rb

@@ -168,36 +168,6 @@ describe "select" do
     click_button
   end
 
-  it "should find options by regexp with HTML entities" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="month"><option>Peanut butter &amp; jelly</option></select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
-    select /Peanut butter & jelly/
-    click_button
-  end
-
-  it "should not find options by regexp with HTML entities in the regexp" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="month"><option>Peanut butter &amp; jelly</option></select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    lambda {
-      select /Peanut butter &amp; jelly/
-    }.should raise_error(Webrat::NotFoundError)
-  end
-
   it "should fail if no option matching the regexp exists" do
     with_html <<-HTML
       <html>
@@ -231,6 +201,7 @@ describe "select" do
   end
 
   it "should properly handle submitting HTML entities in select values" do
+    pending "needs bug fix" do
       with_html <<-HTML
         <html>
         <form method="post" action="/login">
@@ -239,27 +210,13 @@ describe "select" do
         </form>
         </html>
       HTML
-
       webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
       click_button
     end
+  end
 
   it "should properly handle locating with HTML entities in select values" do
-    with_html <<-HTML
+    pending "needs bug fix" do
-      <html>
-      <form method="post" action="/login">
-        <select name="month"><option>Peanut butter &amp; jelly</option></select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
-    select "Peanut butter & jelly"
-    click_button
-  end
-
-  it "should not locate based on HTML entities" do
       with_html <<-HTML
         <html>
         <form method="post" action="/login">
@@ -270,8 +227,9 @@ describe "select" do
       HTML
 
       lambda {
-      select "Peanut butter &amp; jelly"
+        select "Peanut butter & jelly"
-    }.should raise_error(Webrat::NotFoundError)
+      }.should_not raise_error(Webrat::NotFoundError)
+    end
   end
 
   it "should submit duplicates selected options as a single value" do
@@ -288,168 +246,4 @@ describe "select" do
     click_button
   end
 
-  it "should allow fields to be unselected" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes">
-          <option value="tshirt" selected="selected">tshirt</option>
-          <option value="pants">pants</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", {"clothes"=>""})
-    unselect "tshirt"
-    click_button
-  end
-
-  #
-  # Mutliple Selection Fields
-  #
-
-  it "should not submit any values for multiples without any selected" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option value="tshirt">tshirt</option>
-          <option value="pants">pants</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", {})
-    click_button
-  end
-
-  it "should submit with preselected values" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option value="tshirt" selected="selected">tshirt</option>
-          <option value="pants" selected="selected">pants</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "clothes" => ['tshirt', 'pants'])
-    click_button
-  end
-
-  it "should allow selection of multiple fields" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option value="tshirt">tshirt</option>
-          <option value="pants">pants</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "clothes" => ['pants'])
-    select 'pants'
-    click_button
-  end
-
-  it "should not overwrite preselected multiples" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option value="tshirt" selected="selected">tshirt</option>
-          <option value="pants">pants</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "clothes" => ['tshirt', 'pants'])
-    select 'pants'
-    click_button
-  end
-
-  it "should allow fields that exist to be selected or throw errors" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option value="top" selected="selected">shirt</option>
-          <option value="pants">trousers</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    lambda { select "shirt" }.should_not raise_error(Webrat::NotFoundError)
-    lambda { select "trousers" }.should_not raise_error(Webrat::NotFoundError)
-    lambda { select "shoes" }.should raise_error(Webrat::NotFoundError)
-  end
-
-  it "should allow selected fields to be unselected" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option value="tshirt" selected="selected">tshirt</option>
-          <option value="pants" selected="selected">pants</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "clothes" => ['pants'])
-    unselect 'tshirt'
-    click_button
-  end
-
-  it "should be able to select options with special characters" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option>tshirt &amp; sweater</option>
-          <option>pants &amp; socks</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "clothes" => ['pants & socks'])
-    select 'pants & socks'
-    click_button
-  end
-
-  it "should be able to unselect options with special characters" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/login">
-        <select name="clothes[]" multiple="multiple">
-          <option selected="selected">tshirt &amp; sweater</option>
-          <option selected="selected">pants &amp; socks</option>
-        </select>
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-
-    webrat_session.should_receive(:post).with("/login", "clothes" => ['tshirt & sweater'])
-    unselect 'pants & socks'
-    click_button
-  end
-
 end