honkster-webrat 0.6.0 → 0.6.0.9

data/.gitignore

@@ -13,4 +13,7 @@ results
 test_apps
 *.tmproj
 *.log
-.idea
+.idea
+*.pid
+bin
+vendor/gems

data/Gemfile

@@ -0,0 +1,19 @@
+clear_sources
+source 'http://gemcutter.org'
+
+disable_system_gems
+
+gem "git",              "1.2.5"
+gem "rake",             "0.8.7"
+gem "rspec",            "1.2.9"
+gem "diff-lcs",         "1.1.2"
+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"

data/History.txt

@@ -1,4 +1,4 @@
-== 0.6.rc1 / 2009-09-22
+== 0.6.0 / 2009-11-28
 
 REMOVED: Support for Hpricot + REXML as an alternative to Nokogiri.
 
@@ -12,6 +12,7 @@ CHANGED: Due to a reorganization, if you're currently requiring "webrat/rspec-ra
 
 * 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)
@@ -19,6 +20,8 @@ CHANGED: Due to a reorganization, if you're currently requiring "webrat/rspec-ra
 
 * 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)

data/Rakefile

@@ -1,43 +1,5 @@
 require "rubygems"
 
-begin
-  require 'jeweler'
-rescue LoadError
-  desc "Install gem using sudo"
-  task(:install) do
-    $stderr.puts "Jeweler not available. `gem install jeweler` to install this gem"
-  end
-else
-  Jeweler::Tasks.new do |s|
-    s.name      = "honkster-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 = "honkster-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"
-
-    s.add_development_dependency "rails", ">= 2.3"
-    s.add_development_dependency "merb-core", ">= 1.0"
-    s.add_development_dependency "launchy"
-  end
-
-  Jeweler::RubyforgeTasks.new
-end
-
 begin
   require 'spec/rake/spectask'
 rescue LoadError
@@ -179,10 +141,4 @@ desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
 end
-
-if defined?(Jeweler)
-  task :spec => :check_dependencies
-  task :build => :gemspec
-end
-
 task :default => :spec

data/Thorfile

@@ -0,0 +1,117 @@
+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      = "honkster-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"
+    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("honkster-webrat.gemspec"))
+  end
+
+  def sh(command)
+    puts command
+    system command
+  end
+end
+
+class Default < Thor
+  include GemHelpers
+
+  desc "gemspec", "Regenerate honkster-webrat.gemspec"
+  def gemspec
+    File.open("honkster-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 honkster-webrat.gemspec"
+    read_gemspec.validate
+  end
+
+  desc "build", "Build a webrat gem"
+  def build
+    sh "gem build honkster-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

data/honkster-webrat.gemspec

@@ -0,0 +1,348 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{honkster-webrat}
+  s.version = "0.6.0.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bryan Helmkamp"]
+  s.date = %q{2009-12-21}
+  s.description = %q{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.}
+  s.email = %q{bryan@brynary.com}
+  s.extra_rdoc_files = [
+    "README.rdoc",
+    "MIT-LICENSE.txt",
+    "History.txt"
+  ]
+  s.files = [
+    ".document",
+    ".gitignore",
+    "Gemfile",
+    "History.txt",
+    "MIT-LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "Thorfile",
+    "honkster-webrat.gemspec",
+    "install.rb",
+    "lib/webrat.rb",
+    "lib/webrat/adapters/mechanize.rb",
+    "lib/webrat/adapters/merb.rb",
+    "lib/webrat/adapters/rack.rb",
+    "lib/webrat/adapters/rails.rb",
+    "lib/webrat/adapters/sinatra.rb",
+    "lib/webrat/core.rb",
+    "lib/webrat/core/configuration.rb",
+    "lib/webrat/core/elements/area.rb",
+    "lib/webrat/core/elements/element.rb",
+    "lib/webrat/core/elements/field.rb",
+    "lib/webrat/core/elements/form.rb",
+    "lib/webrat/core/elements/label.rb",
+    "lib/webrat/core/elements/link.rb",
+    "lib/webrat/core/elements/select_option.rb",
+    "lib/webrat/core/locators.rb",
+    "lib/webrat/core/locators/area_locator.rb",
+    "lib/webrat/core/locators/button_locator.rb",
+    "lib/webrat/core/locators/field_by_id_locator.rb",
+    "lib/webrat/core/locators/field_labeled_locator.rb",
+    "lib/webrat/core/locators/field_locator.rb",
+    "lib/webrat/core/locators/field_named_locator.rb",
+    "lib/webrat/core/locators/form_locator.rb",
+    "lib/webrat/core/locators/label_locator.rb",
+    "lib/webrat/core/locators/link_locator.rb",
+    "lib/webrat/core/locators/locator.rb",
+    "lib/webrat/core/locators/select_option_locator.rb",
+    "lib/webrat/core/logging.rb",
+    "lib/webrat/core/matchers.rb",
+    "lib/webrat/core/matchers/have_content.rb",
+    "lib/webrat/core/matchers/have_selector.rb",
+    "lib/webrat/core/matchers/have_tag.rb",
+    "lib/webrat/core/matchers/have_xpath.rb",
+    "lib/webrat/core/methods.rb",
+    "lib/webrat/core/mime.rb",
+    "lib/webrat/core/save_and_open_page.rb",
+    "lib/webrat/core/scope.rb",
+    "lib/webrat/core/session.rb",
+    "lib/webrat/core/xml.rb",
+    "lib/webrat/core_extensions/blank.rb",
+    "lib/webrat/core_extensions/deprecate.rb",
+    "lib/webrat/core_extensions/detect_mapped.rb",
+    "lib/webrat/core_extensions/meta_class.rb",
+    "lib/webrat/core_extensions/nil_to_param.rb",
+    "lib/webrat/core_extensions/tcp_socket.rb",
+    "lib/webrat/integrations/merb.rb",
+    "lib/webrat/integrations/rails.rb",
+    "lib/webrat/integrations/rspec-rails.rb",
+    "lib/webrat/integrations/selenium.rb",
+    "lib/webrat/merb.rb",
+    "lib/webrat/rspec-rails.rb",
+    "lib/webrat/selenium.rb",
+    "lib/webrat/selenium/application_server_factory.rb",
+    "lib/webrat/selenium/application_servers.rb",
+    "lib/webrat/selenium/application_servers/base.rb",
+    "lib/webrat/selenium/application_servers/external.rb",
+    "lib/webrat/selenium/application_servers/merb.rb",
+    "lib/webrat/selenium/application_servers/rails.rb",
+    "lib/webrat/selenium/application_servers/sinatra.rb",
+    "lib/webrat/selenium/location_strategy_javascript/button.js",
+    "lib/webrat/selenium/location_strategy_javascript/label.js",
+    "lib/webrat/selenium/location_strategy_javascript/webrat.js",
+    "lib/webrat/selenium/location_strategy_javascript/webratlink.js",
+    "lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js",
+    "lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js",
+    "lib/webrat/selenium/matchers.rb",
+    "lib/webrat/selenium/matchers/have_content.rb",
+    "lib/webrat/selenium/matchers/have_selector.rb",
+    "lib/webrat/selenium/matchers/have_tag.rb",
+    "lib/webrat/selenium/matchers/have_xpath.rb",
+    "lib/webrat/selenium/selenium_extensions.js",
+    "lib/webrat/selenium/selenium_rc_server.rb",
+    "lib/webrat/selenium/selenium_session.rb",
+    "lib/webrat/selenium/silence_stream.rb",
+    "spec/fakes/test_adapter.rb",
+    "spec/integration/mechanize/Rakefile",
+    "spec/integration/mechanize/config.ru",
+    "spec/integration/mechanize/sample_app.rb",
+    "spec/integration/mechanize/spec/mechanize_spec.rb",
+    "spec/integration/mechanize/spec/spec_helper.rb",
+    "spec/integration/merb/.gitignore",
+    "spec/integration/merb/Rakefile",
+    "spec/integration/merb/app/controllers/application.rb",
+    "spec/integration/merb/app/controllers/exceptions.rb",
+    "spec/integration/merb/app/controllers/testing.rb",
+    "spec/integration/merb/app/views/exceptions/not_acceptable.html.erb",
+    "spec/integration/merb/app/views/exceptions/not_found.html.erb",
+    "spec/integration/merb/app/views/layout/application.html.erb",
+    "spec/integration/merb/app/views/testing/show_form.html.erb",
+    "spec/integration/merb/app/views/testing/upload.html.erb",
+    "spec/integration/merb/config/environments/development.rb",
+    "spec/integration/merb/config/environments/rake.rb",
+    "spec/integration/merb/config/environments/test.rb",
+    "spec/integration/merb/config/init.rb",
+    "spec/integration/merb/config/rack.rb",
+    "spec/integration/merb/config/router.rb",
+    "spec/integration/merb/spec/spec.opts",
+    "spec/integration/merb/spec/spec_helper.rb",
+    "spec/integration/merb/spec/webrat_spec.rb",
+    "spec/integration/merb/tasks/merb.thor/app_script.rb",
+    "spec/integration/merb/tasks/merb.thor/common.rb",
+    "spec/integration/merb/tasks/merb.thor/gem_ext.rb",
+    "spec/integration/merb/tasks/merb.thor/main.thor",
+    "spec/integration/merb/tasks/merb.thor/ops.rb",
+    "spec/integration/merb/tasks/merb.thor/utils.rb",
+    "spec/integration/rack/Rakefile",
+    "spec/integration/rack/app.rb",
+    "spec/integration/rack/test/helper.rb",
+    "spec/integration/rack/test/webrat_rack_test.rb",
+    "spec/integration/rails/.gitignore",
+    "spec/integration/rails/Rakefile",
+    "spec/integration/rails/app/controllers/application_controller.rb",
+    "spec/integration/rails/app/controllers/buttons_controller.rb",
+    "spec/integration/rails/app/controllers/fields_controller.rb",
+    "spec/integration/rails/app/controllers/links_controller.rb",
+    "spec/integration/rails/app/controllers/webrat_controller.rb",
+    "spec/integration/rails/app/helpers/buttons_helper.rb",
+    "spec/integration/rails/app/helpers/fields_helper.rb",
+    "spec/integration/rails/app/helpers/links_helper.rb",
+    "spec/integration/rails/app/views/buttons/show.html.erb",
+    "spec/integration/rails/app/views/fields/show.html.erb",
+    "spec/integration/rails/app/views/links/show.html.erb",
+    "spec/integration/rails/app/views/webrat/before_redirect_form.html.erb",
+    "spec/integration/rails/app/views/webrat/buttons.html.erb",
+    "spec/integration/rails/app/views/webrat/form.html.erb",
+    "spec/integration/rails/app/views/webrat/within.html.erb",
+    "spec/integration/rails/config/boot.rb",
+    "spec/integration/rails/config/environment.rb",
+    "spec/integration/rails/config/environments/development.rb",
+    "spec/integration/rails/config/environments/selenium.rb",
+    "spec/integration/rails/config/environments/test.rb",
+    "spec/integration/rails/config/initializers/inflections.rb",
+    "spec/integration/rails/config/initializers/mime_types.rb",
+    "spec/integration/rails/config/initializers/new_rails_defaults.rb",
+    "spec/integration/rails/config/locales/en.yml",
+    "spec/integration/rails/config/routes.rb",
+    "spec/integration/rails/public/404.html",
+    "spec/integration/rails/public/422.html",
+    "spec/integration/rails/public/500.html",
+    "spec/integration/rails/script/about",
+    "spec/integration/rails/script/console",
+    "spec/integration/rails/script/dbconsole",
+    "spec/integration/rails/script/destroy",
+    "spec/integration/rails/script/generate",
+    "spec/integration/rails/script/performance/benchmarker",
+    "spec/integration/rails/script/performance/profiler",
+    "spec/integration/rails/script/performance/request",
+    "spec/integration/rails/script/plugin",
+    "spec/integration/rails/script/process/inspector",
+    "spec/integration/rails/script/process/reaper",
+    "spec/integration/rails/script/process/spawner",
+    "spec/integration/rails/script/runner",
+    "spec/integration/rails/script/server",
+    "spec/integration/rails/test/integration/button_click_test.rb",
+    "spec/integration/rails/test/integration/fill_in_test.rb",
+    "spec/integration/rails/test/integration/link_click_test.rb",
+    "spec/integration/rails/test/integration/webrat_test.rb",
+    "spec/integration/rails/test/test_helper.rb",
+    "spec/integration/sinatra/Rakefile",
+    "spec/integration/sinatra/classic_app.rb",
+    "spec/integration/sinatra/modular_app.rb",
+    "spec/integration/sinatra/test/classic_app_test.rb",
+    "spec/integration/sinatra/test/modular_app_test.rb",
+    "spec/integration/sinatra/test/test_helper.rb",
+    "spec/private/core/configuration_spec.rb",
+    "spec/private/core/field_spec.rb",
+    "spec/private/core/link_spec.rb",
+    "spec/private/core/session_spec.rb",
+    "spec/private/mechanize/mechanize_adapter_spec.rb",
+    "spec/private/nokogiri_spec.rb",
+    "spec/private/rails/attaches_file_spec.rb",
+    "spec/private/rails/rails_adapter_spec.rb",
+    "spec/private/selenium/application_servers/rails_spec.rb",
+    "spec/public/basic_auth_spec.rb",
+    "spec/public/check_spec.rb",
+    "spec/public/choose_spec.rb",
+    "spec/public/click_area_spec.rb",
+    "spec/public/click_button_spec.rb",
+    "spec/public/click_link_spec.rb",
+    "spec/public/fill_in_spec.rb",
+    "spec/public/locators/field_by_xpath_spec.rb",
+    "spec/public/locators/field_labeled_spec.rb",
+    "spec/public/locators/field_with_id_spec.rb",
+    "spec/public/matchers/contain_spec.rb",
+    "spec/public/matchers/have_selector_spec.rb",
+    "spec/public/matchers/have_tag_spec.rb",
+    "spec/public/matchers/have_xpath_spec.rb",
+    "spec/public/reload_spec.rb",
+    "spec/public/save_and_open_spec.rb",
+    "spec/public/select_date_spec.rb",
+    "spec/public/select_datetime_spec.rb",
+    "spec/public/select_spec.rb",
+    "spec/public/select_time_spec.rb",
+    "spec/public/selenium/application_server_factory_spec.rb",
+    "spec/public/selenium/application_servers/external_spec.rb",
+    "spec/public/selenium/selenium_session_spec.rb",
+    "spec/public/set_hidden_field_spec.rb",
+    "spec/public/submit_form_spec.rb",
+    "spec/public/visit_spec.rb",
+    "spec/public/within_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "vendor/selenium-server.jar"
+  ]
+  s.homepage = %q{http://github.com/brynary/webrat}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{webrat}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Ruby Acceptance Testing for Web applications}
+  s.test_files = [
+    "spec/fakes/test_adapter.rb",
+    "spec/integration/mechanize/sample_app.rb",
+    "spec/integration/mechanize/spec/mechanize_spec.rb",
+    "spec/integration/mechanize/spec/spec_helper.rb",
+    "spec/integration/merb/app/controllers/application.rb",
+    "spec/integration/merb/app/controllers/exceptions.rb",
+    "spec/integration/merb/app/controllers/testing.rb",
+    "spec/integration/merb/config/environments/development.rb",
+    "spec/integration/merb/config/environments/rake.rb",
+    "spec/integration/merb/config/environments/test.rb",
+    "spec/integration/merb/config/init.rb",
+    "spec/integration/merb/config/rack.rb",
+    "spec/integration/merb/config/router.rb",
+    "spec/integration/merb/spec/spec_helper.rb",
+    "spec/integration/merb/spec/webrat_spec.rb",
+    "spec/integration/merb/tasks/merb.thor/app_script.rb",
+    "spec/integration/merb/tasks/merb.thor/common.rb",
+    "spec/integration/merb/tasks/merb.thor/gem_ext.rb",
+    "spec/integration/merb/tasks/merb.thor/ops.rb",
+    "spec/integration/merb/tasks/merb.thor/utils.rb",
+    "spec/integration/rack/app.rb",
+    "spec/integration/rack/test/helper.rb",
+    "spec/integration/rack/test/webrat_rack_test.rb",
+    "spec/integration/rails/app/controllers/application_controller.rb",
+    "spec/integration/rails/app/controllers/buttons_controller.rb",
+    "spec/integration/rails/app/controllers/fields_controller.rb",
+    "spec/integration/rails/app/controllers/links_controller.rb",
+    "spec/integration/rails/app/controllers/webrat_controller.rb",
+    "spec/integration/rails/app/helpers/buttons_helper.rb",
+    "spec/integration/rails/app/helpers/fields_helper.rb",
+    "spec/integration/rails/app/helpers/links_helper.rb",
+    "spec/integration/rails/config/boot.rb",
+    "spec/integration/rails/config/environment.rb",
+    "spec/integration/rails/config/environments/development.rb",
+    "spec/integration/rails/config/environments/selenium.rb",
+    "spec/integration/rails/config/environments/test.rb",
+    "spec/integration/rails/config/initializers/inflections.rb",
+    "spec/integration/rails/config/initializers/mime_types.rb",
+    "spec/integration/rails/config/initializers/new_rails_defaults.rb",
+    "spec/integration/rails/config/routes.rb",
+    "spec/integration/rails/test/integration/button_click_test.rb",
+    "spec/integration/rails/test/integration/fill_in_test.rb",
+    "spec/integration/rails/test/integration/link_click_test.rb",
+    "spec/integration/rails/test/integration/webrat_test.rb",
+    "spec/integration/rails/test/test_helper.rb",
+    "spec/integration/sinatra/classic_app.rb",
+    "spec/integration/sinatra/modular_app.rb",
+    "spec/integration/sinatra/test/classic_app_test.rb",
+    "spec/integration/sinatra/test/modular_app_test.rb",
+    "spec/integration/sinatra/test/test_helper.rb",
+    "spec/private/core/configuration_spec.rb",
+    "spec/private/core/field_spec.rb",
+    "spec/private/core/link_spec.rb",
+    "spec/private/core/session_spec.rb",
+    "spec/private/mechanize/mechanize_adapter_spec.rb",
+    "spec/private/nokogiri_spec.rb",
+    "spec/private/rails/attaches_file_spec.rb",
+    "spec/private/rails/rails_adapter_spec.rb",
+    "spec/private/selenium/application_servers/rails_spec.rb",
+    "spec/public/basic_auth_spec.rb",
+    "spec/public/check_spec.rb",
+    "spec/public/choose_spec.rb",
+    "spec/public/click_area_spec.rb",
+    "spec/public/click_button_spec.rb",
+    "spec/public/click_link_spec.rb",
+    "spec/public/fill_in_spec.rb",
+    "spec/public/locators/field_by_xpath_spec.rb",
+    "spec/public/locators/field_labeled_spec.rb",
+    "spec/public/locators/field_with_id_spec.rb",
+    "spec/public/matchers/contain_spec.rb",
+    "spec/public/matchers/have_selector_spec.rb",
+    "spec/public/matchers/have_tag_spec.rb",
+    "spec/public/matchers/have_xpath_spec.rb",
+    "spec/public/reload_spec.rb",
+    "spec/public/save_and_open_spec.rb",
+    "spec/public/select_date_spec.rb",
+    "spec/public/select_datetime_spec.rb",
+    "spec/public/select_spec.rb",
+    "spec/public/select_time_spec.rb",
+    "spec/public/selenium/application_server_factory_spec.rb",
+    "spec/public/selenium/application_servers/external_spec.rb",
+    "spec/public/selenium/selenium_session_spec.rb",
+    "spec/public/set_hidden_field_spec.rb",
+    "spec/public/submit_form_spec.rb",
+    "spec/public/visit_spec.rb",
+    "spec/public/within_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.0"])
+    else
+      s.add_dependency(%q<nokogiri>, [">= 1.2.0"])
+      s.add_dependency(%q<rack>, [">= 1.0"])
+    end
+  else
+    s.add_dependency(%q<nokogiri>, [">= 1.2.0"])
+    s.add_dependency(%q<rack>, [">= 1.0"])
+  end
+end

data/lib/webrat/core/configuration.rb

@@ -58,6 +58,9 @@ module Webrat
     # loop? Defaults to 10
     attr_accessor :infinite_redirect_limit
 
+    # How long to wait for Selenium actions unless overridden.  Defaults to 10 seconds.
+    attr_accessor :default_timeout_in_seconds
+
     def initialize # :nodoc:
       self.open_error_files = true
       self.application_environment = :test
@@ -66,6 +69,7 @@ module Webrat
       self.application_framework = :rails
       self.selenium_server_port = 4444
       self.infinite_redirect_limit = 10
+      self.default_timeout_in_seconds = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
     end

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

@@ -53,7 +53,7 @@ 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', '([a-f0-9]{40})'\);/ || onclick =~ /s\.setAttribute\('value', '(.{44})'\);/ )
       $LAST_MATCH_INFO.captures.first
     end
 

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

@@ -16,7 +16,21 @@ module Webrat
       def matching_links
         @matching_links ||= link_elements.select do |link_element|
           matches_text?(link_element) ||
-          matches_id?(link_element)
+          matches_id?(link_element) ||
+          matches_img?(link_element)
+        end
+      end
+
+      def matches_img?(link)
+        if @value.is_a?(Regexp)
+          matcher = @value
+        else
+          matcher = /#{Regexp.escape(@value.to_s)}/i
+        end
+
+        link.css("img").any? do |img|
+          img["title"] =~ matcher ||
+          img["src"] =~ matcher
         end
       end
 
@@ -28,7 +42,6 @@ module Webrat
         end
 
         replace_nbsp(link.inner_text) =~ matcher ||
-        replace_nbsp_ref(link.inner_html) =~ matcher ||
         link["title"] =~ matcher
       end
 

data/lib/webrat/core/session.rb

@@ -105,7 +105,7 @@ For example:
     end
 
     def basic_auth(user, pass)
-      encoded_login = ["#{user}:#{pass}"].pack("m*")
+      encoded_login = ["#{user}:#{pass}"].pack("m*").gsub(/\n/, '')
       header('HTTP_AUTHORIZATION', "Basic #{encoded_login}")
     end
 

data/lib/webrat/integrations/rspec-rails.rb

@@ -1,8 +1,9 @@
 # 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/rspec-rails'
+#   require 'webrat/integrations/rspec-rails'
 #
+require "nokogiri"
 require "webrat/core/matchers"
 
 Spec::Runner.configure do |config|