webrat 0.5.3 → 0.6.0

data/.gitignore

@@ -12,4 +12,7 @@ log
 results
 test_apps
 *.tmproj
-*.log
+*.log
+*.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,3 +1,32 @@
+== 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
 
 * Minor enhancements

data/Rakefile

@@ -1,58 +1,26 @@
-begin
-  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
+require "rubygems"
 
-  Jeweler::RubyforgeTasks.new
+begin
+  require 'spec/rake/spectask'
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-# 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\""]
-  t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
-end
-
-desc "Run all specs in spec directory with RCov"
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = lambda do
-    IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+  desc "Run specs"
+  task(:spec) { $stderr.puts '`gem install rspec` to run specs' }
+else
+  desc "Run API and Core specs"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
   end
-end
 
-RCov::VerifyTask.new(:verify_rcov => :rcov) do |t|
-  t.threshold = 96.2 # Make sure you have rcov 0.7 or higher!
+  desc "Run all specs in spec directory with RCov"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
+  end
 end
 
 desc "Run everything against multiruby"
@@ -107,18 +75,18 @@ 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 => ["integration:rails", "integration:merb", "integration:sinatra", "integration:rack", "integration:mechanize"]
+  task :integration => [
+    "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
@@ -174,8 +142,4 @@ task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
 end
 
-if defined?(Jeweler)
-  task :spec => :check_dependencies
-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      = "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("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

data/lib/webrat.rb

@@ -1,10 +1,18 @@
+require "rack"
+require "nokogiri"
+
 module Webrat
+  VERSION = "0.6.0"
+
+  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"

data/lib/webrat/adapters/merb.rb

@@ -0,0 +1,11 @@
+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

data/lib/webrat/{rails.rb → adapters/rails.rb}

@@ -1,4 +1,5 @@
-require "webrat"
+require "webrat/integrations/rails"
+require "action_controller/record_identifier"
 
 module Webrat
   class RailsAdapter #:nodoc:
@@ -10,21 +11,6 @@ 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
@@ -93,10 +79,3 @@ module Webrat
     end
   end
 end
-
-module ActionController #:nodoc:
-  IntegrationTest.class_eval do
-    include Webrat::Methods
-    include Webrat::Matchers
-  end
-end

data/lib/webrat/{sinatra.rb → adapters/sinatra.rb}

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

data/lib/webrat/core.rb

@@ -1,6 +1,5 @@
 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"

data/lib/webrat/core/configuration.rb

@@ -16,13 +16,10 @@ module Webrat
   # Webrat can be configured using the Webrat.configure method. For example:
   #
   #   Webrat.configure do |config|
-  #     config.parse_with_nokogiri = false
+  #     config.mode = :sinatra
   #   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:
 
@@ -63,7 +60,6 @@ module Webrat
 
     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'
@@ -74,10 +70,6 @@ module Webrat
       self.selenium_browser_startup_timeout = 5
     end
 
-    def parse_with_nokogiri? #:nodoc:
-      @parse_with_nokogiri ? true : false
-    end
-
     def open_error_files? #:nodoc:
       @open_error_files ? true : false
     end
@@ -87,13 +79,11 @@ module Webrat
     def mode=(mode)
       @mode = mode.to_sym
 
-      # This is a temporary hack to support backwards compatibility
-      # with Merb 1.0.8 until it's updated to use the new Webrat.configure
-      # syntax
-      if @mode == :merb
-        require("webrat/merb_adapter")
-      else
-        require("webrat/#{mode}")
+      begin
+        require("webrat/integrations/#{mode}")
+      rescue LoadError
+        # Only some modes have integration code that needs to
+        # be loaded, so this is OK
       end
     end
 

data/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
-      Webrat::XML.attribute(@element, "href")
+      @element["href"]
     end
 
     def absolute_href