aslakhellesoy-webrat 0.3.2.2 → 0.4.4.1

data/History.txt

@@ -1,25 +1,144 @@
-== Trunk (Git)
+== 0.4.5 / ?
+
+* Major enhancements
+
+  * Improve performance (~2x) on JRuby by supporting Nokogiri
+  * Added support for external app servers in selenium mode (basically don't start one) (Mike Gaffney)
+
+* Minor enhancements
+
+  * Added support for field_labeled_locators ending in non word characters
+    lh 148 (Zach Dennis)
+  * Filled in tests on click link lh 195 (diabolo)
+  * Added current_url to selenium session lh 215 (Luke Amdor)
+  * Added silence spec to selenium lh 238 (Martin Gamsjaeger aka snusnu)
+  * Added ability to configure the browser startup timeout for selenium lh 242 (Mike Gaffney, Mark Dodwell)
+  * Added delegation for field_named lh194 (pivotal labs)
+  * Added fix to keep from escaping field values in mechanize mode lh256 (jish)
+  * Adding fixes for click button/link and made the integration specs pass for the same in selenium lh254 (Ldiehl, Matthias Marschall)
+  * Adding clicking link by id in selenium mode lh221 (larrytheliquid)
+  * Adding fix for have_selector and have_xpath in descendent blocks lh234 (Thomas Jack)
+  * Adding fix for fields with labels with special characters (Thomas Jack, Mike Gaffney, Bryan Hemlkamp)
+  * Deprecated current_page lh50 (Mike Gaffney)
+
+== 0.4.4 / 2009-04-06
+
+* Major enhancements
+
+  * Make selenium process management code more robust and informative
+  
+* Minor enhancements
+  
+  * Add support for Rails javascript post links (Mark Menard)
+  * Upgrade selenium-client dependency to 1.2.14, and update for new waiting
+    API (Balint Erdi)
+  * Change default app environment from "selenium" to "test"
+
+* Bug fixes
+
+  * Don't create a new instance of WWW::Mechanize for each request
+    (Mark Menard)
+  * Select fields with duplicate selected options sent an incorrect value (Noah Davis)
+  
+== 0.4.3 / 2009-03-17
+
+* Minor enhancements
+
+  * Support Rails 2.3. Use Rack::Utils to parse params (Matthew Ford)
+  * Support for "modular" Sinatra app style (Simon Rozet)
+  * Initial Merb and Sinatra compatibility for Selenium mode (Corey Donohoe)
+  * When faced with a label with no for attribute, that contains a hidden field
+    and another field, as can be the case in Rails 2.3's checkbox view,
+    webrat now locates the non-hidden field. (Luke Melia) 
+  * Add application_framework config for Selenium mode to determine how to
+    start and stop the app server (Corey Donohoe)
+
+* Bug fixes
+
+  * Fix following of absolute redirect URL in Sinatra (Simon Rozet)
+
+== 0.4.2 / 2009-02-24
+
+* Major enhancements
+
+  * Significant improvements to have_selector. It now supports specifying
+    attributes in a hash and :count and :content options. See
+    have_selector_spec.rb for more.
+  * Add the same functionality mentioned above to have_xpath
+    
+* Minor enhancements
+
+  * Squeeze extra whitespace out of failures messages from contain
+    matcher
+  * Detect infinite redirects and raise a Webrat::InfiniteRedirectError
+    (Daniel Lucraft)
+
+* Bug fixes
+
+  * Properly quote single and double quotes strings in XPath
+  * Fix warning caused by Nokogiri deprecating CSS::Parser.parse
+    (Aaron Patterson)
+  * Accept do/end blocks in matchers. [#157] (Peter Jaros)
+  * Quote --chdir option to mongrel_rails to support RAILS_ROOTs with spaces
+    (T.J. VanSlyke)
+
+== 0.4.1 / 2009-01-31
+
+* Minor enhancements
+
+  * Support Sinatra 0.9 (Harry Vangberg)
+  * Update query param parsing to work with latest Edge Rails
+  * Added #redirected_to method to easily check where an external redirect was
+    redirected to (Adam Greene)
+  * Recognize input tags with type button (Lena Herrmann)
+  * Add uncheck method to Selenium mode (Lee Bankewitz)
+    
+* Bug fixes
+
+  * Make requests to a Rails app using a full URL instead of a relative path. This change
+    is helpful for Rails apps that use subdomains. (John Hwang and Zach Dennis)
+  * Follow redirects that are on the same domain but a different subdomain
+    (Adam Greene)
+  * rescue from Webrat::TimeoutError in selenium matchers which allows NegativeMatchers
+    to behave correctly (Noah Davis)
+  * Switch to using selenium.click instead of .check when checking a checkbox
+    (Noah Davis)
+  * Create tmp/pids directory if directory does not exist. (Amos King and Mike Gaffney)  
+  * Setup deprecated writers for the selenium_environment= and selenium_port= config
+  * Ensure the previous pages params aren't passed through redirect (Daniel Lucraft and
+    Bryan Helmkamp)
+  * Labels should only search for fields within the current scope (Kyle Hargraves)
+
+== 0.4.0 / 2009-01-18
 
 * _IMPORTANT_ Breaking change:
 
   * Removed init.rb auto-require of webrat/rails
   * Removed auto-require of webrat/rails when requiring webrat when RAILS_ENV is
     defined
-  
+
   In your env.rb or test_helper.rb file, ensure you have something like:
-  
+
     require "webrat"
-    
+
     Webrat.configure do |config|
       config.mode = :rails
     end
-  
+
 * Major enhancements
 
+  * Major improvements to Webrat::Selenium (Many contributors listed here)
+  * Add assert_* methods for using Webrat's matchers w/o RSpec (Mike Gaffney, Amos King)
+  * Added Webrat.configure method for Webrat configuration [#33] (Mike Gaffney)
   * Added select_time, select_date, and select_datetime to API. [#36] (Ben Mabey)
   * Use Hpricot and REXML when not parsing with Nokogiri (on JRuby, for example)
 
 * Minor enhancements
+
+  * Added Selenium grid configuration and support. (Amos King && Cornel Borcean)
+  * Support passing an ActiveRecord model to #within when in Rails mode [#68] (Luke Melia)
+  * Make assert_* matchers in rails mode increment the assertions count [#123] (Amos King)
+  * Added assert_* matchers to selenium matchers [#110] (Amos King)
   * Added assert_contain, assert_not_contain [#86] (Mike Gaffney, Amos King)
   * Add configuration options for the Selenium environment and port (Kieran Pilkington)
   * Maximize the browser window after initializing Selenium (Luke Melia)
@@ -44,14 +163,12 @@
   * Add submit_form method for submitting a form by ID (Noah Davis, Bryan Helmkamp)
   * Switch to using Nokogiri.parse for simple XML/XHTML autodetection [#66]
   * Removed Webrat.root method, which seemed to be unused
-  * Added Webrat.configure method for global Webrat configuration [#33]
-    (Mike Gaffney)
   * Added automatic starting and stopping of the Selenium server and a Mongrel Rails
     app server when using webrat/selenium
   * Switch to using selenium-client gem and vendor selenium-server.jar (Luke Melia)
   * Added gemspec so the gem builds on GitHub now
   * Deprecate old style methods (fills_in is deprecated in favor of fill_in, etc.)
-  * Improcements to the README and RDoc (Bryan Helmkamp, Mike Gaffney)
+  * Improvements to the README and RDoc (Bryan Helmkamp, Mike Gaffney)
   * Allow clicking links by id and id regexp (Mike Gaffney)
   * Raise Webrat::DisabledFieldError when attempting to manipulate a disabled field
   * Raise Webrat::NotFoundErrors when an element is not found
@@ -63,6 +180,12 @@
 
 * Bug fixes
   
+  * field_labeled should disregard labels without matching fields (Kyle Hargraves)
+  * Fixed bug where Scope was creating a new DOM rather than re-using the existing DOM.
+    [#105] (Zach Dennis)
+  * Support Rails > v2.2 by using ActionController::RequestParser for param parsing [#107]
+    (Marcello Nuccio)
+  * Raise a Webrat::NotFoundError if the scope passed to #within doesn't exist [#90]
   * Match against link _text_ which decodes character references.
     Useful for multibyte languages like Japanese (moronatural@gmail.com)
   * Fix params hash generation for Mechanize when Merb is not defined [#62]
@@ -74,23 +197,39 @@
   * Fixed bug where Webrat would lose complex parameters (like foo[bar[baz]][])
     in Merb due to not correctly merging Mashes. (Drew Colthorp)
   * Extend Rails' ActionController::IntegrationTest instead of
-    ActionController::Integration::Session (Fixes using Webrat's #select method and 
+    ActionController::Integration::Session (Fixes using Webrat's #select method and
     avoids usage of method_missing)
-  * Ensure that Webrat::MechanizeSession.request_page always uses an absolute 
+  * Ensure that Webrat::MechanizeSession.request_page always uses an absolute
     URL. (Graham Ashton)
   * Strip anchor tags from URIs before passing to Rails integration session
     (Noah Davis)
   * Treat text and regexp when matching Selenium buttons (Ross Kaffenberger)
   * Allow SeleniumSession's click_button to be called without an argument without
     blowing up (Luke Melia)
-    
+
+== 0.3.4 / 2008-12-29
+
+* 1 Minor enhancement
+
+  * Fix compatibility with Nokogiri 1.1.0 on JRuby
+
+* 1 Bug fix
+
+  * Correct version for Nokogiri dependency in gem
+
+== 0.3.3 / 2008-12-28
+
+* 1 Minor enhancement
+
+  * Fix compatibility with Nokogiri 1.1.0 on MRI
+
 == 0.3.2 / 2008-11-08
 
 * 1 Minor enhancement
 
   * Fixes behavior or have_tag when a block is passed. It passes the matched node(s)
     to the block for further specs again. (Carl Lerche)
-  
+
 == 0.3.1 / 2008-11-07
 
 * 1 Minor enhancement
@@ -106,7 +245,7 @@
   * Added experimental Selenium support (Luke Melia)
   * Add have_selector, have_xpath, have_tag and contain matchers from Merb
   * Switch from Hpricot to Nokogiri for XML parsing (thanks, Aaron Patterson)
-  
+
 * 37 Minor enhancements
 
   * Added #within for manipulating the current page within a selector scope
@@ -153,7 +292,7 @@
   * Switched tests to specs, and from Mocha to RSpec's mocking library
   * Add support to click_button for IDs (Gwyn Morfey)
   * Miscellaneous core refactorings (Jan Suchal)
-  
+
 * 8 Bug fixes
 
   * Fix initialization of WWW::Mechanize (Derek Kastner)
@@ -165,7 +304,7 @@
   * Don't explode if encountering inputs with no type attribute (assume text)
   * Fix bug where choosing a radio button in a series with a default submitted the
     incorrect field value (Luke Melia)
-  
+
 == 0.2.0 / 2008-04-04
 
 * 4 Major enhancements
@@ -175,12 +314,12 @@
   * Add basic support for Rails-generated JavaScript link tags
   * Add support for checkboxes (Patches from Kyle Hargraves and Jarkko Laine)
   * Add support for textarea fields (Sacha Schlegel)
-  
+
 * 8 Minor enhancements
-  
+
   * Added reloads method to reload the page (Kamal Fariz Mahyuddi)
   * Prevent making a request if clicking on local anchor link (Kamal Fariz Mahyuddi)
-  * Added clicks_link_within(selector, link_text), allowing restricting link search 
+  * Added clicks_link_within(selector, link_text), allowing restricting link search
     to within a given css selector (Luke Melia)
   * Allow specifying the input name/label when doing a select (David Chelimsky)
   * Raise a specific exception if the developer tries to manipulate form elements
@@ -188,7 +327,7 @@
   * Add support for alternate POST, PUT and DELETE link clicking (Kyle Hargraves)
   * Change clicks_link to find the shortest matching link (Luke Melia)
   * Improve matching for labels in potentially ambiguous cases
-  
+
 * 7 Bug fixes
 
   * Fix incorrect serializing of collection inputs, i.e. name contains []

data/Rakefile

@@ -28,7 +28,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
 
   # Dependencies
-  s.add_dependency "nokogiri", ">= 1.1.0"
+  s.add_dependency "nokogiri", ">= 1.2.0"
 
   s.rubyforge_project = "webrat"
 end
@@ -72,7 +72,7 @@ end
 desc 'Install the package as a gem.'
 task :install_gem => [:clean, :package] do
   gem_filename = Dir['pkg/*.gem'].first
-  sh "sudo gem install --local #{gem_filename}"
+  sh "sudo gem install --no-rdoc --no-ri --local #{gem_filename}"
 end
 
 desc "Delete generated RDoc"
@@ -87,7 +87,8 @@ end
 
 desc "Run specs using jruby"
 task "spec:jruby" do
-  system "jruby -S rake spec"
+  result = system "jruby -S rake spec"
+  raise "JRuby tests failed" unless result
 end
 
 desc "Run each spec in isolation to test for dependency issues"
@@ -105,14 +106,25 @@ end
 
 namespace :spec do
   desc "Run the integration specs"
-  task :integration => ["integration:rails", "integration:merb", "integration:sinatra"]
+  task :integration => ["integration:rails", "integration:merb", "integration:sinatra", "integration:rack"]
 
   namespace :integration do
     desc "Run the Rails integration specs"
-    task :rails do
-      Dir.chdir "spec/integration/rails" do
-        result = system "rake test:integration"
-        raise "Rails integration tests failed" unless result
+    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 test_unit:selenium"
+          raise "Rails integration tests failed" unless result
+        end
+      end
+
+      task :webrat do
+        Dir.chdir "spec/integration/rails" do
+          result = system "rake test_unit:rails"
+          raise "Rails integration tests failed" unless result
+        end
       end
     end
 
@@ -128,12 +140,25 @@ namespace :spec do
     task :sinatra do
       Dir.chdir "spec/integration/sinatra" do
         result = system "rake test"
-        raise "Sinatra tntegration tests failed" unless result
+        raise "Sinatra integration tests failed" unless result
+      end
+    end
+    
+    desc "Run the Sinatra integration specs"
+    task :rack do
+      Dir.chdir "spec/integration/rack" do
+        result = system "rake test"
+        raise "Rack integration tests failed" unless result
       end
     end
   end
 end
 
-task :default => :spec
+task :default => [:"spec:integration", :spec]
+
+task :precommit => ["spec", "spec:jruby", "spec:integration"]
 
-task :precommit => ["spec", "spec:jruby", "spec:integration"]
+desc 'Removes trailing whitespace'
+task :whitespace do
+  sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
+end

data/lib/webrat.rb

@@ -7,26 +7,23 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.3.2.2'
+  VERSION = '0.4.4.1'
 
   def self.require_xml
-    gem "nokogiri", ">= 1.0.6"
-    
     if on_java?
-      # We need Nokogiri's CSS to XPath support, even if using REXML and Hpricot for parsing and searching
-      require "nokogiri/css"
-      require "hpricot"
-      require "rexml/document"
+      gem "nokogiri", ">= 1.2.4"
     else
-      require "nokogiri"
-      require "webrat/core/xml/nokogiri"
+      gem "nokogiri", ">= 1.0.6"
     end
+
+    require "nokogiri"
+    require "webrat/core/xml/nokogiri"
   end
-  
+
   def self.on_java?
     RUBY_PLATFORM =~ /java/
   end
-  
+
 end
 
 Webrat.require_xml

data/lib/webrat/core/configuration.rb

@@ -1,60 +1,102 @@
+require "webrat/core_extensions/deprecate"
+
 module Webrat
-  
+
   # Configures Webrat. If this is not done, Webrat will be created
-  # with all of the default settings. 
-  def self.configure(configuration = Webrat::Configuration.new)
+  # with all of the default settings.
+  def self.configure(configuration = Webrat.configuration)
     yield configuration if block_given?
     @@configuration = configuration
   end
-      
+
   def self.configuration # :nodoc:
     @@configuration ||= Webrat::Configuration.new
   end
 
   # Webrat can be configured using the Webrat.configure method. For example:
-  # 
+  #
   #   Webrat.configure do |config|
   #     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_accessor :mode # :nodoc:
-    
+    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
-    
-    # Which environment should the selenium tests be run in? Defaults to selenium.
-    attr_accessor :selenium_environment
 
-    # Which port should the selenium tests be run on? Defaults to 3001.
-    attr_accessor :selenium_port
+    # Which rails environment should the selenium tests be run in? Defaults to selenium.
+    attr_accessor :application_environment
+    webrat_deprecate :selenium_environment, :application_environment
+    webrat_deprecate :selenium_environment=, :application_environment=
+
+    # Which port is the application running on for selenium testing? Defaults to 3001.
+    attr_accessor :application_port
+    webrat_deprecate :selenium_port, :application_port
+    webrat_deprecate :selenium_port=, :application_port=
+
+    # Which underlying app framework we're testing with selenium
+    attr_accessor :application_framework
+
+    # Which server the application is running on for selenium testing? Defaults to localhost
+    attr_accessor :application_address
+
+    # Which server Selenium server is running on. Defaults to nil(server starts in webrat process and runs locally)
+    attr_accessor :selenium_server_address
+
+    # Which server Selenium port is running on. Defaults to 4444
+    attr_accessor :selenium_server_port
+
+    # Set the key that Selenium uses to determine the browser running. Default *firefox
+    attr_accessor :selenium_browser_key
+
+    # Set the timeout for waiting for the browser process to start
+    attr_accessor :selenium_browser_startup_timeout
+
+    # How many redirects to the same URL should be halted as an infinite redirect
+    # loop? Defaults to 10
+    attr_accessor :infinite_redirect_limit
 
     def initialize # :nodoc:
       self.open_error_files = true
-      self.parse_with_nokogiri = !Webrat.on_java?
-      self.selenium_environment = :selenium
-      self.selenium_port = 3001
+      self.parse_with_nokogiri = true
+      self.application_environment = :test
+      self.application_port = 3001
+      self.application_address = 'localhost'
+      self.application_framework = :rails
+      self.selenium_server_port = 4444
+      self.infinite_redirect_limit = 10
+      self.selenium_browser_key = '*firefox'
+      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
-    
+
     # Allows setting of webrat's mode, valid modes are:
     # :rails, :selenium, :rack, :sinatra, :mechanize, :merb
     def mode=(mode)
-      @mode = mode
-      require("webrat/#{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}")
+      end
     end
-    
+
   end
-  
-end
+
+end