diabolo-webrat 0.4.4 → 0.4.4.1

data/History.txt

@@ -1,10 +1,16 @@
 == 0.4.5 / ?
 
+* Major enhancements
+
+  * Improve performance (~2x) on JRuby by supporting Nokogiri
+
 * 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)
 
 == 0.4.4 / 2009-04-06
 

data/Rakefile

@@ -37,7 +37,7 @@ end
 
 Rake::GemPackageTask.new(spec) do |package|
   package.gem_spec = spec
-endrak
+end
 
 Jeweler::Tasks.new(spec)
 
@@ -110,7 +110,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"
@@ -144,7 +144,15 @@ 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

data/lib/webrat.rb

@@ -10,17 +10,14 @@ module Webrat
   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?

data/lib/webrat/core/configuration.rb

@@ -60,7 +60,7 @@ module Webrat
 
     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'

data/lib/webrat/core/logging.rb

@@ -13,7 +13,10 @@ module Webrat
       when :merb
         Merb.logger
       else
-        nil
+        @logger ||= begin
+          require "logger"
+          ::Logger.new("webrat.log")
+        end
       end
     end
 

data/lib/webrat/core/methods.rb

@@ -16,7 +16,11 @@ module Webrat
     end
 
     def webrat_session
-      @_webrat_session ||= ::Webrat.session_class.new(self)
+      if Webrat.configuration.mode == :rack_test
+        @_webrat_session ||= ::Webrat::RackTestSession.new(rack_test_session)
+      else
+        @_webrat_session ||= ::Webrat.session_class.new(self)
+      end
     end
 
     # all of these methods delegate to the @session, which should

data/lib/webrat/core/scope.rb

@@ -209,8 +209,8 @@ module Webrat
     # along with the form. An optional <tt>content_type</tt> may be given.
     #
     # Example:
-    #   attaches_file "Resume", "/path/to/the/resume.txt"
-    #   attaches_file "Photo", "/path/to/the/image.png", "image/png"
+    #   attach_file "Resume", "/path/to/the/resume.txt"
+    #   attach_file "Photo", "/path/to/the/image.png", "image/png"
     def attach_file(field_locator, path, content_type = nil)
       locate_field(field_locator, FileField).set(path, content_type)
     end

data/lib/webrat/core/session.rb

@@ -26,6 +26,8 @@ module Webrat
       SinatraSession
     when :mechanize
       MechanizeSession
+    when :rack_test
+      RackTestSession
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -100,11 +102,8 @@ For example:
       h['HTTP_REFERER'] = @current_url if @current_url
 
       debug_log "REQUESTING PAGE: #{http_method.to_s.upcase} #{url} with #{data.inspect} and HTTP headers #{h.inspect}"
-      if h.empty?
-        send "#{http_method}", url, data || {}
-      else
-        send "#{http_method}", url, data || {}, h
-      end
+
+      process_request(http_method, url, data, h)
 
       save_and_open_page if exception_caught? && Webrat.configuration.open_error_files?
       raise PageLoadError.new("Page load was not successful (Code: #{response_code.inspect}):\n#{formatted_error}") unless success_code?
@@ -259,6 +258,14 @@ For example:
 
   private
 
+    def process_request(http_method, url, data, headers)
+      if headers.empty?
+        send "#{http_method}", url, data || {}
+      else
+        send "#{http_method}", url, data || {}, headers
+      end
+    end
+
     def response_location
       response.headers["Location"]
     end

data/lib/webrat/rack_test.rb

@@ -0,0 +1,32 @@
+module Webrat
+  class RackTestSession < Session
+
+    def initialize(rack_test_session) #:nodoc:
+      super()
+      @rack_test_session = rack_test_session
+    end
+
+    def response_body
+      response.body
+    end
+
+    def response_code
+      response.status
+    end
+
+    def response
+      @rack_test_session.last_response
+    end
+
+  protected
+
+    def process_request(http_method, url, data = {}, headers = {})
+      headers ||= {}
+      data    ||= {}
+
+      env = headers.merge(:params => data, :method => http_method.to_s.upcase)
+      @rack_test_session.request(url, env)
+    end
+
+  end
+end

data/lib/webrat/selenium.rb

@@ -1,6 +1,13 @@
 require "webrat"
 gem "selenium-client", ">=1.2.14"
 require "selenium/client"
+
+# active_support already defines silence_stream, no need to do that again if it's already present.
+# http://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/kernel/reporting.rb
+unless Kernel.respond_to?(:silence_stream)
+  require "webrat/selenium/silence_stream"
+end
+
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"
 require "webrat/core_extensions/tcp_socket"

data/lib/webrat/selenium/application_server.rb

@@ -2,6 +2,8 @@ module Webrat
   module Selenium
 
     class ApplicationServer
+      
+      include Webrat::Selenium::SilenceStream
 
       def self.boot
         case Webrat.configuration.application_framework

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -2,6 +2,8 @@ module Webrat
   module Selenium
 
     class SeleniumRCServer
+      
+      include Webrat::Selenium::SilenceStream
 
       def self.boot
         new.boot

data/lib/webrat/selenium/selenium_session.rb

@@ -22,6 +22,7 @@ module Webrat
 
   class SeleniumSession
     include Webrat::SaveAndOpenPage
+    include Webrat::Selenium::SilenceStream
 
     def initialize(*args) # :nodoc:
     end
@@ -55,6 +56,10 @@ module Webrat
       selenium.get_html_source
     end
 
+    def current_url
+      selenium.location
+    end
+
     def click_button(button_text_or_regexp = nil, options = {})
       if button_text_or_regexp.is_a?(Hash) && options == {}
         pattern, options = nil, button_text_or_regexp
@@ -182,15 +187,6 @@ module Webrat
 
   protected
 
-    def silence_stream(stream)
-      old_stream = stream.dup
-      stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
-      stream.sync = true
-      yield
-    ensure
-      stream.reopen(old_stream)
-    end
-
     def setup #:nodoc:
       Webrat::Selenium::SeleniumRCServer.boot
       Webrat::Selenium::ApplicationServer.boot

data/lib/webrat/selenium/silence_stream.rb

@@ -0,0 +1,14 @@
+module Webrat
+  module Selenium
+    module SilenceStream
+      def silence_stream(stream)
+        old_stream = stream.dup
+        stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+        stream.sync = true
+        yield
+      ensure
+        stream.reopen(old_stream)
+      end
+    end
+  end
+end

data/spec/integration/rack/rack_app.rb

@@ -0,0 +1,16 @@
+require "rubygems"
+require "sinatra/base"
+
+class RackApp < Sinatra::Default
+  get "/" do
+    "Hello World"
+  end
+
+  get "/redirect_absolute_url" do
+    redirect URI.join(request.url, "foo").to_s
+  end
+
+  get "/foo" do
+    "spam"
+  end
+end

data/spec/integration/rack/test/test_helper.rb

@@ -0,0 +1,20 @@
+require "rubygems"
+require "test/unit"
+require "rack/test"
+require "redgreen"
+
+require File.dirname(__FILE__) + "/../../../../lib/webrat"
+
+Webrat.configure do |config|
+  config.mode = :rack_test
+end
+
+class Test::Unit::TestCase
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers
+
+  def app
+    RackApp.new
+  end
+end

data/spec/integration/rack/test/webrat_rack_test.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + "/test_helper"
+require File.dirname(__FILE__) + "/../rack_app"
+
+class WebratRackTest < Test::Unit::TestCase
+  def test_visit_returns_response
+    response = visit "/"
+    assert response.ok?
+  end
+
+  def test_last_response_is_available
+    visit "/"
+    assert last_response.ok?
+  end
+
+  def test_last_request_is_available
+    visit "/"
+    assert_equal "/", last_request.env["PATH_INFO"]
+  end
+
+  def test_redirects
+    visit "/redirect_absolute_url"
+    assert_equal "spam", response_body
+  end
+
+  def test_assertions_after_visit
+    visit "/"
+    assert_contain "Hello World"
+  end
+
+  def test_assertions_after_visit
+    get "/"
+    assert_contain "Hello World"
+  end
+
+  # def test_visits_pages
+  #   visit "/"
+  #   assert response_body.include?("visit")
+  #
+  #   click_link "there"
+  #   assert response_body.include?('<form method="post" action="/go">')
+  # end
+  #
+  # def test_submits_form
+  #   visit "/go"
+  #   fill_in "Name", :with => "World"
+  #   fill_in "Email", :with => "world@example.org"
+  #   click_button "Submit"
+  #
+  #   assert response_body.include?("Hello, World")
+  #   assert response_body.include?("Your email is: world@example.org")
+  # end
+  #
+  # def test_check_value_of_field
+  #   visit "/"
+  #   assert field_labeled("Prefilled").value, "text"
+  # end
+  #
+  # def test_follows_internal_redirects
+  #   visit "/internal_redirect"
+  #   assert response_body.include?("visit")
+  # end
+  #
+  # def test_does_not_follow_external_redirects
+  #   visit "/external_redirect"
+  #   assert response_code == 302
+  # end
+end

data/spec/integration/rails/test/integration/webrat_test.rb

@@ -10,6 +10,7 @@ class WebratTest < ActionController::IntegrationTest
   test "should visit pages" do
     visit root_path
     assert_contain("Webrat Form")
+    assert URI.parse(current_url).path, root_path
   end
 
   test "should submit forms" do

data/spec/private/core/configuration_spec.rb

@@ -9,17 +9,10 @@ describe Webrat::Configuration do
   end
 
   it "should use Nokogiri as the parser by default" do
-    Webrat.stub!(:on_java? => false)
     config = Webrat::Configuration.new
     config.should parse_with_nokogiri
   end
 
-  it "should not use Nokogiri as the parser when on JRuby" do
-    Webrat.stub!(:on_java? => true)
-    config = Webrat::Configuration.new
-    config.should_not parse_with_nokogiri
-  end
-
   it "should open error files by default" do
     config = Webrat::Configuration.new
     config.should open_error_files

data/spec/private/core/field_spec.rb

@@ -2,16 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 module Webrat
   describe Field do
-    it "should have nice inspect output" do
-      html = <<-HTML
-        <html>
-        <input type='checkbox' checked='checked' />
-        </html>
-      HTML
+    unless Webrat.on_java?
+      it "should have nice inspect output" do
+        html = <<-HTML
+          <html>
+          <input type='checkbox' checked='checked' />
+          </html>
+        HTML
 
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
-      checkbox = CheckboxField.new(nil, element)
-      checkbox.inspect.should =~ /#<Webrat::CheckboxField @element=<input type=['"]checkbox['"] checked(=['"]checked['"])?\/?>>/
+        element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+        checkbox = CheckboxField.new(nil, element)
+        checkbox.inspect.should =~ /#<Webrat::CheckboxField @element=<input type=['"]checkbox['"] checked(=['"]checked['"])?\/?>>/
+      end
     end
   end
 

data/spec/public/click_button_spec.rb

@@ -331,7 +331,7 @@ describe "click_button" do
   end
 
   it "should properly handle HTML entities in textarea default values" do
-    spec = lambda do
+    pending "needs bug fix" do
       with_html <<-HTML
         <html>
         <form method="post" action="/posts">
@@ -343,12 +343,6 @@ describe "click_button" do
       webrat_session.should_receive(:post).with("/posts", "post" => {"body" => "Peanut butter & jelly"})
       click_button
     end
-
-    if Webrat.on_java?
-      spec.call
-    else
-      pending("needs bug fix", &spec)
-    end
   end
 
   it "should send default selected option value from select" do

data/spec/public/click_link_spec.rb

@@ -101,7 +101,7 @@ describe "click_link" do
     webrat_session.should_receive(:get).with("/page", {})
     click_link /_text_/
   end
-  
+
   it "should click links by title" do
     with_html <<-HTML
       <html>
@@ -111,7 +111,7 @@ describe "click_link" do
     webrat_session.should_receive(:get).with("/page", {})
     click_link 'piddle'
   end
-  
+
   it "should click links by title regex" do
     with_html <<-HTML
       <html>

data/spec/public/locators/field_labeled_spec.rb

@@ -153,7 +153,7 @@ describe "field_labeled" do
     should_return_a Webrat::TextField, :for => "The Label"
     with_an_id_of   "element_42",      :for => "The Label"
   end
-  
+
   describe "finding a field whose label ends with an non word character" do
     using_this_html <<-HTML
       <html>
@@ -163,7 +163,7 @@ describe "field_labeled" do
       </form>
       </html>
     HTML
-  
+
     should_return_a Webrat::TextField, :for => "License #"
     with_an_id_of  "element_42",       :for => "License #"
     should_raise_error_matching /Could not find .* "Other License #"/, :for => "Other License #"

data/spec/public/select_date_spec.rb

@@ -71,7 +71,7 @@ describe "select_date" do
     select_date "December 25, 2003"
     click_button
   end
-  
+
   it "should work when the label ends in a non word character" do
     with_html <<-HTML
       <html>

data/spec/public/select_spec.rb

@@ -201,7 +201,7 @@ describe "select" do
   end
 
   it "should properly handle submitting HTML entities in select values" do
-    spec = lambda do
+    pending "needs bug fix" do
       with_html <<-HTML
         <html>
         <form method="post" action="/login">
@@ -213,16 +213,10 @@ describe "select" do
       webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
       click_button
     end
-
-    if Webrat.on_java?
-      spec.call
-    else
-      pending("needs bug fix", &spec)
-    end
   end
 
   it "should properly handle locating with HTML entities in select values" do
-    spec = lambda do
+    pending "needs bug fix" do
       with_html <<-HTML
         <html>
         <form method="post" action="/login">
@@ -236,14 +230,8 @@ describe "select" do
         select "Peanut butter & jelly"
       }.should_not raise_error(Webrat::NotFoundError)
     end
-
-    if Webrat.on_java?
-      spec.call
-    else
-      pending("needs bug fix", &spec)
-    end
   end
-  
+
   it "should submit duplicates selected options as a single value" do
     with_html <<-HTML
       <html>
@@ -253,9 +241,9 @@ describe "select" do
       </form>
       </html>
     HTML
-    
+
     webrat_session.should_receive(:post).with("/login", "clothes" => "pants")
     click_button
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: diabolo-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.4.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - lib/webrat/merb.rb
 - lib/webrat/merb_session.rb
 - lib/webrat/rack.rb
+- lib/webrat/rack_test.rb
 - lib/webrat/rails.rb
 - lib/webrat/rspec-rails.rb
 - lib/webrat/selenium.rb
@@ -104,6 +105,7 @@ files:
 - lib/webrat/selenium/selenium_extensions.js
 - lib/webrat/selenium/selenium_rc_server.rb
 - lib/webrat/selenium/selenium_session.rb
+- lib/webrat/selenium/silence_stream.rb
 - lib/webrat/selenium/sinatra_application_server.rb
 - lib/webrat/sinatra.rb
 - vendor/selenium-server.jar
@@ -151,6 +153,9 @@ test_files:
 - spec/integration/merb/tasks/merb.thor/gem_ext.rb
 - spec/integration/merb/tasks/merb.thor/ops.rb
 - spec/integration/merb/tasks/merb.thor/utils.rb
+- spec/integration/rack/rack_app.rb
+- spec/integration/rack/test/test_helper.rb
+- spec/integration/rack/test/webrat_rack_test.rb
 - spec/integration/rails/app/controllers/application.rb
 - spec/integration/rails/app/controllers/webrat_controller.rb
 - spec/integration/rails/config/boot.rb