brynary-webrat 0.3.2.2 → 0.4.0

data/History.txt

@@ -5,19 +5,31 @@
   * 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 file, ensure you have:
-  
-    require "webrat/rails"
-  
+
+  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
 
+  * Added Selenium grid configuration and support. (Amos King && Cornel Borcean)
   * 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
 
+  * 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)
   * Better inspect output for Webrat elements
+  * Sets the Webrat mode with Configuration#mode= in the config block [#85] (Mike Gaffney)
   * Detect if the document is XML or HTML using the Content-Type when in Rails mode
   * Expose #selenium method for direct access to Selenium client
   * Check nokogiri gem version before requiring nokogiri
@@ -51,9 +63,17 @@
   * Raise Webrat::PageLoadError when a failure occurs so that application exceptions
     can be more accurately tested (Ryan Briones)
   * Helpful error message for missing option in select box. [#40] (Ben Mabey)
+  * Extracted save_and_open page to make it usable in Selenium mode (Luke Melia)
+  * Added save_and_open_screengrab for Selenium mode (Luke Melia)
 
 * 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]
@@ -65,16 +85,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
+    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
@@ -90,7 +133,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
@@ -137,7 +180,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)
@@ -149,7 +192,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
@@ -159,12 +202,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
@@ -172,7 +215,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/README.rdoc

@@ -59,9 +59,13 @@ To install the latest code as a plugin: (_Note:_ This may be less stable than us
 
   script/plugin install git://github.com/brynary/webrat.git
 
-In your test_helper.rb, spec_helper.rb, or env.rb (for Cucumber) add:
+In your test_helper.rb or env.rb (for Cucumber) add:
 
-  require "webrat/rails"
+  require "webrat"
+  
+  Webrat.configure do |config|
+    config.mode = :rails
+  end
   
 == Install with Merb
 

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rubygems'
+# require 'rubygems'
 require "rake/gempackagetask"
 require 'rake/rdoctask'
 require "rake/clean"
@@ -28,8 +28,8 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
 
   # Dependencies
-  s.add_dependency "nokogiri", ">= 1.0.6"
-  
+  s.add_dependency "nokogiri", ">= 1.1.0"
+
   s.rubyforge_project = "webrat"
 end
 
@@ -52,13 +52,13 @@ 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/**/*_spec.rb']
+  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/**/*_spec.rb']
+  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
@@ -71,8 +71,8 @@ end
 
 desc 'Install the package as a gem.'
 task :install_gem => [:clean, :package] do
-  gem = Dir['pkg/*.gem'].first
-  sh "sudo gem install --local #{gem}"
+  gem_filename = Dir['pkg/*.gem'].first
+  sh "sudo gem install --local #{gem_filename}"
 end
 
 desc "Delete generated RDoc"
@@ -99,6 +99,41 @@ 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"]
+
+  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
+      end
+    end
+
+    desc "Run the Merb integration specs"
+    task :merb do
+      Dir.chdir "spec/integration/merb" do
+        result = system "rake spec"
+        raise "Merb integration tests failed" unless result
+      end
+    end
+
+    desc "Run the Sinatra integration specs"
+    task :sinatra do
+      Dir.chdir "spec/integration/sinatra" do
+        result = system "rake test"
+        raise "Sinatra tntegration tests failed" unless result
+      end
+    end
+  end
+end
+
 task :default => :spec
 
-task :precommit => ["spec", "spec:jruby"]
+task :precommit => ["spec", "spec:jruby", "spec:integration"]

data/lib/webrat.rb

@@ -7,7 +7,7 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.3.2.2'
+  VERSION = '0.4.0'
 
   def self.require_xml
     gem "nokogiri", ">= 1.0.6"

data/lib/webrat/core/configuration.rb

@@ -1,44 +1,87 @@
+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 rails environment should the selenium tests be run in? Defaults to selenium.
+    attr_accessor :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
+
+    # 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
+
     def initialize # :nodoc:
       self.open_error_files = true
       self.parse_with_nokogiri = !Webrat.on_java?
+      self.application_environment = :selenium
+      self.application_port = 3001
+      self.application_address = 'localhost'
+      self.selenium_server_port = 4444
+      self.selenium_browser_key = '*firefox'
     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.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

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

@@ -79,7 +79,7 @@ module Webrat
       
       case Webrat.configuration.mode
       when :rails
-        ActionController::AbstractRequest.parse_query_parameters("#{name}=#{escaped_value}")
+        rails_request_parser.parse_query_parameters("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
       else
@@ -97,6 +97,14 @@ module Webrat
     
   protected
   
+    def rails_request_parser
+      if defined?(ActionController::RequestParser) # For Rails > 2.2
+        ActionController::RequestParser
+      else
+        ActionController::AbstractRequest
+      end
+    end
+  
     def form
       Form.load(@session, form_element)
     end

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

@@ -7,7 +7,7 @@ module Webrat
     class FieldLabeledLocator < Locator # :nodoc:
   
       def locate
-        matching_labels.any? && matching_labels.first.field
+        matching_labels.any? && matching_labels.detect_mapped { |label| label.field }
       end
       
       def matching_labels
@@ -42,9 +42,15 @@ module Webrat
       
     end
     
+    # Locates a form field based on a <tt>label</tt> element in the HTML source.
+    # This can be useful in order to verify that a field is pre-filled with the
+    # correct value.
+    #
+    # Example:
+    #   field_labeled("First name").value.should == "Bryan"
     def field_labeled(label, *field_types)
       FieldLabeledLocator.new(@session, dom, label, *field_types).locate!
     end
     
   end
-end
+end

data/lib/webrat/core/matchers/have_content.rb

@@ -51,5 +51,19 @@ module Webrat
       HasContent.new(content)
     end
     
+    # Asserts that the body of the response contain
+    # the supplied string or regexp
+    def assert_contain(content)
+      hc = HasContent.new(content)
+      assert hc.matches?(response_body), hc.failure_message
+    end
+    
+    # Asserts that the body of the response
+    # does not contain the supplied string or regepx
+    def assert_not_contain(content)
+      hc = HasContent.new(content)
+      assert !hc.matches?(response_body), hc.negative_failure_message
+    end
+    
   end
 end

data/lib/webrat/core/matchers/have_selector.rb

@@ -33,5 +33,20 @@ module Webrat
     end
     alias_method :match_selector, :have_selector
     
+    
+    # Asserts that the body of the response contains
+    # the supplied selector
+    def assert_have_selector(expected)
+      hs = HaveSelector.new(expected)
+      assert hs.matches?(response_body), hs.failure_message
+    end
+    
+    # Asserts that the body of the response
+    # does not contain the supplied string or regepx
+    def assert_have_no_selector(expected)
+      hs = HaveSelector.new(expected)
+      assert !hs.matches?(response_body), hs.negative_failure_message
+    end
+    
   end
 end