webrat 0.4.4 → 0.4.5

data/.document

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

data/.gitignore

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

data/History.txt

@@ -1,11 +1,46 @@
+== 0.4.5 / 2009-08-10
+
+* Major enhancements
+
+  * Ruby 1.9 compatibility (Michael Fellinger, Jakub Kuźma)
+  * Improve performance (~2x) on JRuby by supporting Nokogiri
+  * Added support for external app servers in selenium mode (basically don't start one) (Mike Gaffney)
+  * Added support for uploading files for Merb (Ryan Carver)
+
+* 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
+    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)
+  * Fixed issue with redirects and multiple hosts lh168 (Mutwin Kraus)
+
+* Bug fixes
+
+  * Wait for application servers socket on 0.0.0.0 instead of the application_address
+  * Translate CSS and image paths with single quotes in save_and_open_page (Erin Staniland)
+
 == 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)
@@ -15,7 +50,8 @@
 
   * 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
@@ -25,7 +61,7 @@
   * 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) 
+    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)
 
@@ -41,7 +77,7 @@
     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
@@ -68,7 +104,7 @@
     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
@@ -79,7 +115,7 @@
     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)  
+  * 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)
@@ -155,7 +191,7 @@
   * 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)

data/Rakefile

@@ -1,54 +1,32 @@
-# require 'rubygems'
-require "rake/gempackagetask"
-require 'rake/rdoctask'
-require "rake/clean"
-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         = "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
+begin
+  require 'jeweler'
 
-Rake::GemPackageTask.new(spec) do |package|
-  package.gem_spec = spec
-end
+  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  = "TODO"
 
-desc 'Show information about the gem.'
-task :debug_gem do
-  puts spec.to_ruby
-end
+    s.rubyforge_project = "webrat"
+    s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt History.txt]
 
-CLEAN.include ["pkg", "*.gem", "doc", "ri", "coverage"]
+    # Dependencies
+    s.add_dependency "nokogiri", ">= 1.2.0"
 
-desc "Upload rdoc to brynary.com"
-task :publish_rdoc => :docs do
-  sh "scp -r doc/ brynary.com:/apps/uploads/webrat"
+    # TODO: Add development dependencies
+  end
+
+  Jeweler::RubyforgeTasks.new
+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\""]
@@ -69,26 +47,47 @@ 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}"
-end
+desc "Run everything against multiruby"
+task :multiruby do
+  result = system "multiruby -S rake spec"
+  raise "Multiruby tests failed" unless result
+  result = system "jruby -S rake spec"
+  raise "JRuby tests failed" unless result
 
-desc "Delete generated RDoc"
-task :clobber_docs do
-  FileUtils.rm_rf("doc")
-end
+  Dir.chdir "spec/integration/rails" do
+    result = system "multiruby -S rake test_unit:rails"
+    raise "Rails integration tests failed" unless result
 
-desc "Generate RDoc"
-task :docs => :clobber_docs do
-  system "hanna --title 'Webrat #{Webrat::VERSION} API Documentation'"
-end
+    result = system "jruby -S rake test_unit:rails"
+    raise "Rails integration tests failed" unless result
+  end
 
-desc "Run specs using jruby"
-task "spec:jruby" do
-  result = system "jruby -S rake spec"
-  raise "JRuby tests failed" unless result
+  Dir.chdir "spec/integration/merb" do
+    result = system "multiruby -S rake spec"
+    raise "Merb integration tests failed" unless result
+
+    result = system "jruby -S rake spec"
+    raise "Rails integration tests failed" unless result
+  end
+
+  Dir.chdir "spec/integration/sinatra" do
+    result = system "multiruby -S rake test"
+    raise "Sinatra integration tests failed" unless result
+
+    result = system "jruby -S rake test"
+    raise "Sinatra integration tests failed" unless result
+  end
+
+  Dir.chdir "spec/integration/rack" do
+    result = system "multiruby -S rake test"
+    raise "Rack integration tests failed" unless result
+
+    result = system "jruby -S rake test"
+    raise "Rack integration tests failed" unless result
+  end
+
+  puts
+  puts "Multiruby OK!"
 end
 
 desc "Run each spec in isolation to test for dependency issues"
@@ -106,7 +105,7 @@ 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"
@@ -140,12 +139,27 @@ 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
+desc 'Removes trailing whitespace'
+task :whitespace do
+  sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
+end
+
+if defined?(Jeweler)
+  task :spec => :check_dependencies
+end
 
-task :precommit => ["spec", "spec:jruby", "spec:integration"]
+task :default => :spec

data/VERSION

@@ -0,0 +1 @@
+0.4.5

data/lib/webrat.rb

@@ -7,26 +7,21 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.4.4'
-
   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

@@ -54,13 +54,16 @@ module Webrat
     # 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.parse_with_nokogiri = true
       self.application_environment = :test
       self.application_port = 3001
       self.application_address = 'localhost'
@@ -68,6 +71,7 @@ module Webrat
       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:
@@ -82,7 +86,7 @@ module Webrat
     # :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

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

@@ -2,21 +2,21 @@ require "webrat/core/elements/element"
 
 module Webrat
   class Area < Element #:nodoc:
-    
+
     def self.xpath_search
       ".//area"
     end
-    
+
     def click(method = nil, options = {})
       @session.request_page(absolute_href, :get, {})
     end
-    
+
   protected
-    
+
     def href
       Webrat::XML.attribute(@element, "href")
     end
-   
+
     def absolute_href
       if href =~ /^\?/
         "#{@session.current_url}#{href}"
@@ -26,6 +26,6 @@ module Webrat
         href
       end
     end
-    
+
   end
-end
+end

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

@@ -1,33 +1,33 @@
 module Webrat
-  
+
   class Element # :nodoc:
-    
+
     def self.load_all(session, dom)
-      Webrat::XML.xpath_search(dom, xpath_search).map do |element| 
+      Webrat::XML.xpath_search(dom, 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)
     end
-    
+
     attr_reader :element
-    
+
     def initialize(session, element)
       @session  = session
       @element  = element
     end
-    
+
     def path
       Webrat::XML.xpath_to(@element)
     end
-    
+
     def inspect
       "#<#{self.class} @element=#{element.inspect}>"
     end
-    
+
   end
-  
-end
+
+end