diabolo-webrat 0.4.4.2 → 0.5.1

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,55 @@
-== 0.4.5 / ?
+== Git
+
+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 it's 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
+
+  * Update the Merb support to be based directly on Rack (Simon Rozet)
+
+== 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
 
+  * 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)
@@ -18,15 +62,22 @@
   * 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)
@@ -37,7 +88,7 @@
   * 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
@@ -47,7 +98,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)
 
@@ -63,7 +114,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
@@ -90,7 +141,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
@@ -101,7 +152,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)
@@ -177,7 +228,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,57 +1,41 @@
-# 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')
-require 'jeweler'
-
-
-##############################################################################
-# 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
-
-Rake::GemPackageTask.new(spec) do |package|
-  package.gem_spec = spec
-end
-
-Jeweler::Tasks.new(spec)
+require "rubygems"
+
+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
 
-desc 'Show information about the gem.'
-task :debug_gem do
-  puts spec.to_ruby
+  Jeweler::RubyforgeTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
 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
+# require 'spec'
+require 'spec/rake/spectask'
+require 'spec/rake/verify_rcov'
 
 desc "Run API and Core specs"
 Spec::Rake::SpecTask.new do |t|
@@ -73,26 +57,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"
@@ -110,7 +115,7 @@ end
 
 namespace :spec do
   desc "Run the integration specs"
-  task :integration => ["integration:rails", "integration:merb", "integration:sinatra", "integration:rack"]
+  task :integration => ["integration:rails", "integration:merb", "integration:sinatra", "integration:rack", "integration:mechanize"]
 
   namespace :integration do
     desc "Run the Rails integration specs"
@@ -147,7 +152,7 @@ namespace :spec do
         raise "Sinatra integration tests failed" unless result
       end
     end
-    
+
     desc "Run the Sinatra integration specs"
     task :rack do
       Dir.chdir "spec/integration/rack" do
@@ -155,14 +160,24 @@ 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
-
-task :precommit => ["spec", "spec:jruby", "spec:integration"]
-
 desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
-end
+end
+
+if defined?(Jeweler)
+  task :spec => :check_dependencies
+end
+
+task :default => :spec

data/VERSION

@@ -0,0 +1 @@
+0.5.1

data/lib/webrat.rb

@@ -1,31 +1,16 @@
-require "rubygems"
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+require "rack"
+require "nokogiri"
 
 module Webrat
+  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
-
-  VERSION = '0.4.4'
-
-  def self.require_xml
-    if on_java?
-      gem "nokogiri", ">= 1.2.4"
-    else
-      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
-
 require "webrat/core"

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
@@ -67,7 +71,7 @@ module Webrat #:nodoc:
         else
           current_path.split("/")[0..(-1 - levels_up)].join("/")
         end
-        descendent = url.split("/")[levels_up..-1]
+        descendent = url.split("/")[levels_up..-1].join
         "#{ancestor}/#{descendent}"
       end
   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