honkster-webrat 0.4.4.2 → 0.6.0

data/.document

@@ -0,0 +1,4 @@
+README.rdoc
+lib/**/*.rb
+History.txt
+MIT-LICENSE.txt

data/.gitignore

@@ -0,0 +1,16 @@
+coverage
+.DS_Store
+pkg
+doc
+ri
+email.txt
+.svn
+log
+.project
+.loadpath
+*.swp
+results
+test_apps
+*.tmproj
+*.log
+.idea

data/History.txt

@@ -1,4 +1,57 @@
-== 0.4.5 / ?
+== 0.6.rc1 / 2009-09-22
+
+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
+
+  * 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
+
+  * 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
+
+  * Remove unnecessary requires which are to the wrong paths on Edge Rails
+
+== 0.5.1 / 2009-08-18
+
+* Minor enhancements
+
+  * Base Webrat::MIME on Rack::Mime (Simon Rozet)
+  * Support file uploads in Rack mode (Simon Rozet)
+
+* Bug fixes
+
+  * Fix bug in Webrat::Methods preventing Selenium mode from working [#277]
+
+== 0.5.0 / 2009-08-12
+
+* Major enhancements
+
+  * Depreacate :rack_test and :sinatra in favor of :rack, which uses Rack::Test (Simon Rozet)
+
+* Minor enhancements
+
+  * Don't require rubygems at runtime (Simon Rozet)
+
+== 0.4.5 / 2009-08-10
 
 * Major enhancements
 
@@ -9,6 +62,8 @@
 
 * Minor enhancements
 
+  * Upgrade to selenium-client to 1.2.16 (Brian Landau)
+  * Upgrade selenium-server.jar to 1.0.1 (Brian Landau)
   * Make redirect detection work in the face of rational maths (like when ruby-units is active) (Piers Cawley)
   * Use Launchy to handle opening pages in the browser with cross-platform compatibility (Bryan Helmkamp)
   * Added support for field_labeled_locators ending in non word characters

data/Rakefile

@@ -1,89 +1,64 @@
-# require 'rubygems'
-require "rake/gempackagetask"
-require 'rake/rdoctask'
-require "rake/clean"
-gem "rspec", "1.2.6"
-require 'spec'
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
-require File.expand_path('./lib/webrat.rb')
-
-##############################################################################
-# Package && release
-##############################################################################
-spec = Gem::Specification.new do |s|
-  s.name         = "honkster-webrat"
-  s.version      = Webrat::VERSION
-  s.platform     = Gem::Platform::RUBY
-  s.author       = "Bryan Helmkamp"
-  s.email        = "bryan" + "@" + "brynary.com"
-  s.homepage     = "http://github.com/brynary/webrat"
-  s.summary      = "Webrat. Ruby Acceptance Testing for Web applications"
-  s.bindir       = "bin"
-  s.description  = s.summary
-  s.require_path = "lib"
-  s.files        = %w(History.txt install.rb MIT-LICENSE.txt README.rdoc Rakefile) + Dir["lib/**/*"] + Dir["vendor/**/*"]
-
-  # rdoc
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
-
-  # Dependencies
-  s.add_dependency "nokogiri", ">= 1.2.0"
-
-  s.rubyforge_project = "webrat"
-end
-
-Rake::GemPackageTask.new(spec) do |package|
-  package.gem_spec = spec
-end
-
-desc 'Show information about the gem.'
-task :debug_gem do
-  puts spec.to_ruby
-end
-
-CLEAN.include ["pkg", "*.gem", "doc", "ri", "coverage"]
-
-desc "Upload rdoc to brynary.com"
-task :publish_rdoc => :docs do
-  sh "scp -r doc/ brynary.com:/apps/uploads/webrat"
-end
-
-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
+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
-end
-
-RCov::VerifyTask.new(:verify_rcov => :rcov) do |t|
-  t.threshold = 96.2 # Make sure you have rcov 0.7 or higher!
-end
 
-desc 'Install the package as a gem.'
-task :install_gem => [:clean, :package] do
-  gem_filename = Dir['pkg/*.gem'].first
-  sh "sudo gem install --no-rdoc --no-ri --local #{gem_filename}"
+  Jeweler::RubyforgeTasks.new
 end
 
-desc "Delete generated RDoc"
-task :clobber_docs do
-  FileUtils.rm_rf("doc")
-end
+begin
+  require 'spec/rake/spectask'
+rescue LoadError
+  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
 
-desc "Generate RDoc"
-task :docs => :clobber_docs do
-  system "hanna --title 'Webrat #{Webrat::VERSION} API Documentation'"
+  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"
@@ -138,18 +113,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"]
+  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
@@ -189,12 +164,25 @@ namespace :spec do
         raise "Rack integration tests failed" unless result
       end
     end
+
+    desc "Run the Mechanize integration specs"
+    task :mechanize do
+      Dir.chdir "spec/integration/mechanize" do
+        result = system "rake spec"
+        raise "Mechanize integration tests failed" unless result
+      end
+    end
   end
 end
 
-task :default => :spec
-
 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/VERSION

@@ -0,0 +1 @@
+0.6.0

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

@@ -1,11 +1,15 @@
 require "mechanize"
 
 module Webrat #:nodoc:
-  class MechanizeSession < Session #:nodoc:
+  class MechanizeAdapter #:nodoc:
+    extend Forwardable
 
     attr_accessor :response
     alias :page :response
 
+    def initialize(*args)
+    end
+
     def request_page(url, http_method, data) #:nodoc:
       super(absolute_url(url), http_method, data)
     end

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/adapters/rack.rb

@@ -0,0 +1,25 @@
+require "rack/test"
+
+module Webrat
+  class RackAdapter
+    extend Forwardable
+
+    def_delegators :@session, :get, :post, :put, :delete
+
+    def initialize(session) #:nodoc:
+      @session = session
+    end
+
+    def response_body
+      response.body
+    end
+
+    def response_code
+      response.status
+    end
+
+    def response
+      @session.last_response
+    end
+  end
+end

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

@@ -1,26 +1,14 @@
-require "webrat"
-
-require "action_controller"
-require "action_controller/integration"
+require "webrat/integrations/rails"
 require "action_controller/record_identifier"
 
 module Webrat
-  class RailsSession < Session #:nodoc:
+  class RailsAdapter #:nodoc:
     include ActionController::RecordIdentifier
 
-    # 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
+    attr_reader :integration_session
+
+    def initialize(session)
+      @integration_session = session
     end
 
     def doc_root
@@ -61,10 +49,6 @@ module Webrat
 
   protected
 
-    def integration_session
-      @context
-    end
-
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
       integration_session.send(http_method, normalize_url(url), data, headers)
@@ -93,13 +77,5 @@ module Webrat
     def response #:nodoc:
       integration_session.response
     end
-
-  end
-end
-
-module ActionController #:nodoc:
-  IntegrationTest.class_eval do
-    include Webrat::Methods
-    include Webrat::Matchers
   end
 end

data/lib/webrat/adapters/sinatra.rb

@@ -0,0 +1,9 @@
+module Webrat
+  class SinatraAdapter < RackAdapter
+    def initialize(context)
+      app = context.respond_to?(:app) ? context.app : Sinatra::Application
+
+      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
+    end
+  end
+end

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_session")
-      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

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

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