webrat 0.4.5 → 0.5.0

data/History.txt

@@ -1,3 +1,13 @@
+== 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

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.5.0

data/lib/webrat.rb

@@ -1,29 +1,9 @@
-require "rubygems"
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
-
 module Webrat
   # The common base class for all exceptions raised by Webrat.
   class WebratError < StandardError
   end
-
-  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 "nokogiri"
+require "webrat/core/xml/nokogiri"
 require "webrat/core"

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

@@ -87,10 +87,8 @@ module Webrat
         parse_rails_request_params("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
-      when :mechanize
-        { name => value }
       else
-        { name => escaped_value }
+        { name => value }
       end
     end
 

data/lib/webrat/core/methods.rb

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

data/lib/webrat/core/session.rb

@@ -18,16 +18,21 @@ module Webrat
       RailsSession
     when :merb
       MerbSession
-    when :selenium
-      SeleniumSession
     when :rack
       RackSession
+    when :rack_test
+      warn("The :rack_test mode is deprecated. Please use :rack instead")
+      require "webrat/rack"
+      RackSession
+    when :sinatra
+      warn("The :sinatra mode is deprecated. Please use :rack instead")
+      SinatraSession
+    when :selenium
+      SeleniumSession
     when :sinatra
       SinatraSession
     when :mechanize
       MechanizeSession
-    when :rack_test
-      RackTestSession
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -53,12 +58,16 @@ For example:
     attr_reader :current_url
     attr_reader :elements
 
-    def initialize(context = nil) #:nodoc:
+    def_delegators :@adapter, :response, :response_code, :response_body,
+      :response_body=, :response_code=,
+      :get, :post, :put, :delete
+
+    def initialize(adapter=nil)
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
-      @context         = context
+      @adapter         = adapter
 
       reset
     end

data/lib/webrat/merb_session.rb

@@ -3,7 +3,7 @@ require "merb-core"
 require "webrat/merb_multipart_support"
 
 module Webrat
-  class MerbSession < Session #:nodoc:
+  class MerbSession #:nodoc:
     include Merb::Test::MakeRequest
 
     # Include Webrat's own version of multipart_post/put because the officially
@@ -12,6 +12,8 @@ module Webrat
 
     attr_accessor :response
 
+    def initialize(context=nil); end
+
     def get(url, data, headers = nil)
       do_request(url, data, headers, "GET")
     end

data/lib/webrat/rack.rb

@@ -1,24 +1,25 @@
-require 'webrat'
+require "rack/test"
 
-class CGIMethods #:nodoc:
-  def self.parse_query_parameters(params)
-    hash = {}
-    params.split('&').each do |p|
-      pair = p.split('=')
-      hash[pair[0]] = pair[1]
+module Webrat
+  class RackSession
+    extend Forwardable
+
+    def_delegators :@session, :get, :post, :put, :delete
+
+    def initialize(session) #:nodoc:
+      @session = session
     end
-    hash
-  end
-end
 
-module Webrat
-  class RackSession < Session #:nodoc:
     def response_body
-      @response.body
+      response.body
     end
 
     def response_code
-      @response.status
+      response.status
+    end
+
+    def response
+      @session.last_response
     end
   end
 end

data/lib/webrat/rails.rb

@@ -5,9 +5,15 @@ require "action_controller/integration"
 require "action_controller/record_identifier"
 
 module Webrat
-  class RailsSession < Session #:nodoc:
+  class RailsSession #:nodoc:
     include ActionController::RecordIdentifier
 
+    attr_reader :integration_session
+
+    def initialize(session)
+      @integration_session = session
+    end
+
     # The Rails version of within supports passing in a model and Webrat
     # will apply a scope based on Rails' dom_id for that model.
     #
@@ -61,10 +67,6 @@ module Webrat
 
   protected
 
-    def integration_session
-      @context
-    end
-
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
       integration_session.send(http_method, normalize_url(url), data, headers)
@@ -93,7 +95,6 @@ module Webrat
     def response #:nodoc:
       integration_session.response
     end
-
   end
 end
 

data/lib/webrat/selenium.rb

@@ -1,5 +1,4 @@
 require "webrat"
-gem "selenium-client", ">=1.2.16"
 require "selenium/client"
 require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"

data/lib/webrat/sinatra.rb

@@ -1,44 +1,11 @@
 require "webrat/rack"
-require "sinatra/test"
 
 module Webrat
   class SinatraSession < RackSession
-    include Sinatra::Test
-
-    attr_reader :request, :response
-
-    def initialize(context = nil)
-      super(context)
-
+    def initialize(context)
       app = context.respond_to?(:app) ? context.app : Sinatra::Application
-      @browser = Sinatra::TestHarness.new(app)
-    end
-
-    %w(get head post put delete).each do |verb|
-      class_eval <<-RUBY
-        def #{verb}(path, data, headers = {})
-          params = data.inject({}) do |data, (key,value)|
-            data[key] = Rack::Utils.unescape(value)
-            data
-          end
-          headers["HTTP_HOST"] = "www.example.com"
-          @browser.#{verb}(path, params, headers)
-        end
-      RUBY
-    end
-
-    def response_body
-      @browser.body
-    end
 
-    def response_code
-      @browser.status
+      super(Rack::Test::Session.new(Rack::MockSession.new(app, "www.example.com")))
     end
-
-    private
-
-      def response
-        @browser.response
-      end
   end
 end

data/spec/integration/rack/app.rb

@@ -0,0 +1,73 @@
+require "rubygems"
+require "sinatra/base"
+
+class RackApp < Sinatra::Base
+  use_in_file_templates!
+
+  get "/" do
+    erb :home
+  end
+
+  get "/go" do
+    erb :go
+  end
+
+  get "/internal_redirect" do
+    redirect "/"
+  end
+
+  get "/external_redirect" do
+    redirect "http://google.com"
+  end
+
+  get "/absolute_redirect" do
+    redirect URI.join(request.url, "foo").to_s
+  end
+
+  get "/foo" do
+    "spam"
+  end
+
+  post "/go" do
+    @user = params[:name]
+    @email = params[:email]
+    erb :hello
+  end
+end
+
+__END__
+@@ layout
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <title>sinatra testing with webrat</title>
+  <body>
+    <%= yield %>
+  </body>
+</html>
+
+@@ home
+<p> visit <a href="/go">there</a></p>
+
+<form>
+  <label>
+    Prefilled
+    <input type="text" name="prefilled" value="text" />
+  </label>
+</form>
+
+@@ go
+<form method="post" action="/go">
+  <div>
+    <label for="name">Name</label>
+    <input type="text" name="name" id="name">
+  </div>
+  <div>
+    <label for="email">Email</label>
+    <input type="text" name="email" id="email">
+  </div>
+  <input type="submit" value="Submit" />
+</form>
+
+@@ hello
+<p>Hello, <%= @user %></p>
+<p>Your email is: <%= @email %></p>

data/spec/integration/rack/test/{test_helper.rb → helper.rb}

@@ -4,17 +4,17 @@ require "rack/test"
 # require "redgreen"
 
 require File.dirname(__FILE__) + "/../../../../lib/webrat"
+require File.dirname(__FILE__) + "/../app"
 
 Webrat.configure do |config|
-  config.mode = :rack_test
+  config.mode = :rack
 end
 
 class Test::Unit::TestCase
-  include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
-
   def app
-    RackApp.new
+    Rack::Builder.new {
+      use Rack::Lint
+      run RackApp.new
+    }
   end
 end

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

@@ -1,67 +1,62 @@
-require File.dirname(__FILE__) + "/test_helper"
-require File.dirname(__FILE__) + "/../rack_app"
+require File.dirname(__FILE__) + "/helper"
 
 class WebratRackTest < Test::Unit::TestCase
-  def test_visit_returns_response
-    response = visit "/"
-    assert response.ok?
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers
+  include Webrat::HaveTagMatcher
+
+  def build_rack_mock_session
+    Rack::MockSession.new(app, "www.example.com")
   end
 
-  def test_last_response_is_available
-    visit "/"
-    assert last_response.ok?
+  def test_visits_pages
+     visit "/"
+     click_link "there"
+
+     assert_have_tag("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_contain "Hello, World"
+    assert_contain "Your email is: world@example.org"
   end
 
-  def test_last_request_is_available
+  def test_check_value_of_field
     visit "/"
-    assert_equal "/", last_request.env["PATH_INFO"]
+    assert_equal field_labeled("Prefilled").value, "text"
   end
 
-  # def test_redirects
-  #   visit "/redirect_absolute_url"
-  #   assert_equal "spam", response_body
-  # end
+  def test_follows_internal_redirects
+    visit "/internal_redirect"
+    assert_contain "visit"
+  end
 
-  def test_assertions_after_visit
-    visit "/"
-    assert_contain "Hello World"
+  def test_does_not_follow_external_redirects
+    visit "/external_redirect"
+    assert last_response.redirect?
   end
 
-  def test_assertions_after_visit
-    get "/"
-    assert_contain "Hello World"
+  def test_absolute_url_redirect
+    visit "/absolute_redirect"
+    assert_contain "spam"
   end
+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
+class WebratRackSetupTest < Test::Unit::TestCase
+  def test_usable_without_mixin
+    rack_test_session = Rack::Test::Session.new(Rack::MockSession.new(app))
+    adapter = Webrat::RackSession.new(rack_test_session)
+    session = Webrat::Session.new(adapter)
+
+    session.visit "/foo"
+
+    assert_equal "spam", session.response_body
+    assert_equal "spam", rack_test_session.last_response.body
+  end
 end

data/spec/private/core/field_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 module Webrat
   describe Field do
-    unless Webrat.on_java?
+    unless RUBY_PLATFORM =~ /java/
       it "should have nice inspect output" do
         html = <<-HTML
           <html>

data/spec/private/rails/rails_session_spec.rb

@@ -87,6 +87,8 @@ describe Webrat::RailsSession do
   end
 
   it "should accept an ActiveRecord argument to #within and translate to a selector using dom_id" do
+    pending "Move this to spec/public/within_spec.rb"
+
     body = <<-HTML
       <a href="/page1">Edit</a>
       <div id="new_object">

data/spec/public/matchers/contain_spec.rb

@@ -56,13 +56,13 @@ describe "contain" do
       it "should throw an exception when the body doesnt contain the text" do
         lambda {
           assert_contain("monkeys")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
 
       it "should throw an exception when the body doesnt contain the regexp" do
         lambda {
           assert_contain(/monkeys/)
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
 
@@ -78,13 +78,13 @@ describe "contain" do
       it "should throw an exception when the body does contain the text" do
         lambda {
           assert_not_contain("hello, world")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
 
       it "should throw an exception when the body does contain the regexp" do
         lambda {
           assert_not_contain(/hello, world/)
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
   end

data/spec/public/matchers/have_selector_spec.rb

@@ -122,7 +122,7 @@ describe "have_selector" do
       it "should throw an exception when the body doesnt have matching selection" do
         lambda {
           assert_have_selector("p")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
 
@@ -134,7 +134,7 @@ describe "have_selector" do
       it "should throw an exception when the body does contain the selection" do
         lambda {
           assert_have_no_selector("div")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
   end

data/spec/public/matchers/have_xpath_spec.rb

@@ -117,7 +117,7 @@ describe "have_xpath" do
       it "should throw an exception when the body doesnt have matching xpath" do
         lambda {
           assert_have_xpath("//p")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
 
@@ -129,7 +129,7 @@ describe "have_xpath" do
       it "should throw an exception when the body does contain the xpath" do
         lambda {
           assert_have_no_xpath("//div")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ begin require "redgreen" unless ENV['TM_CURRENT_LINE']; rescue LoadError; end
 webrat_path = File.expand_path(File.dirname(__FILE__) + "/../lib/")
 $LOAD_PATH.unshift(webrat_path) unless $LOAD_PATH.include?(webrat_path)
 
+AssertionFailedError = Test::Unit::AssertionFailedError rescue MiniTest::Assertion # ruby1.9 compat
+
 require "webrat"
 require File.expand_path(File.dirname(__FILE__) + "/fakes/test_session")
 

data/webrat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webrat}
-  s.version = "0.4.5"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-08-10}
+  s.date = %q{2009-08-12}
   s.email = %q{bryan@brynary.com}
   s.extra_rdoc_files = [
     "History.txt",
@@ -73,7 +73,6 @@ Gem::Specification.new do |s|
      "lib/webrat/merb_multipart_support.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",
@@ -127,8 +126,8 @@ Gem::Specification.new do |s|
      "spec/integration/merb/tasks/merb.thor/ops.rb",
      "spec/integration/merb/tasks/merb.thor/utils.rb",
      "spec/integration/rack/Rakefile",
-     "spec/integration/rack/rack_app.rb",
-     "spec/integration/rack/test/test_helper.rb",
+     "spec/integration/rack/app.rb",
+     "spec/integration/rack/test/helper.rb",
      "spec/integration/rack/test/webrat_rack_test.rb",
      "spec/integration/rails/.gitignore",
      "spec/integration/rails/Rakefile",
@@ -253,8 +252,8 @@ Gem::Specification.new do |s|
      "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/app.rb",
+     "spec/integration/rack/test/helper.rb",
      "spec/integration/rack/test/webrat_rack_test.rb",
      "spec/integration/rails/app/controllers/application.rb",
      "spec/integration/rails/app/controllers/buttons_controller.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -04:00
+date: 2009-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,6 @@ files:
 - lib/webrat/merb_multipart_support.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
@@ -143,8 +142,8 @@ files:
 - spec/integration/merb/tasks/merb.thor/ops.rb
 - spec/integration/merb/tasks/merb.thor/utils.rb
 - spec/integration/rack/Rakefile
-- spec/integration/rack/rack_app.rb
-- spec/integration/rack/test/test_helper.rb
+- spec/integration/rack/app.rb
+- spec/integration/rack/test/helper.rb
 - spec/integration/rack/test/webrat_rack_test.rb
 - spec/integration/rails/.gitignore
 - spec/integration/rails/Rakefile
@@ -290,8 +289,8 @@ 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/app.rb
+- spec/integration/rack/test/helper.rb
 - spec/integration/rack/test/webrat_rack_test.rb
 - spec/integration/rails/app/controllers/application.rb
 - spec/integration/rails/app/controllers/buttons_controller.rb

data/lib/webrat/rack_test.rb

@@ -1,32 +0,0 @@
-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/spec/integration/rack/rack_app.rb

@@ -1,16 +0,0 @@
-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