webrat 0.5.0 → 0.5.1

data/History.txt

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

data/Rakefile

@@ -7,13 +7,21 @@ begin
     s.email     = "bryan" + "@" + "brynary.com"
     s.homepage  = "http://github.com/brynary/webrat"
     s.summary   = "Ruby Acceptance Testing for Web applications"
-    # s.description  = "TODO"
+    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
@@ -105,7 +113,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"
@@ -150,6 +158,14 @@ 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
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/webrat.rb

@@ -4,6 +4,7 @@ module Webrat
   end
 end
 
+require "rack"
 require "nokogiri"
 require "webrat/core/xml/nokogiri"
 require "webrat/core"

data/lib/webrat/core/configuration.rb

@@ -91,7 +91,7 @@ module Webrat
       # with Merb 1.0.8 until it's updated to use the new Webrat.configure
       # syntax
       if @mode == :merb
-        require("webrat/merb_session")
+        require("webrat/merb_adapter")
       else
         require("webrat/#{mode}")
       end

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

@@ -366,6 +366,8 @@ module Webrat
       when :merb
         # TODO: support content_type
         File.new(@value)
+      when :rack
+        Rack::Test::UploadedFile.new(@value, content_type)
       end
     end
 

data/lib/webrat/core/methods.rb

@@ -16,11 +16,11 @@ module Webrat
     end
 
     def webrat_session
-      @_webrat_session ||= ::Webrat::Session.new(webrat_adapter)
-    end
-
-    def webrat_adapter
-      @_webrat_adapter ||= Webrat.session_class.new(self)
+      @_webrat_session ||= begin
+        session = Webrat.session_class.new
+        session.adapter = Webrat.adapter_class.new(self) if session.respond_to?(:adapter=)
+        session
+      end
     end
 
     # all of these methods delegate to the @session, which should

data/lib/webrat/core/mime.rb

@@ -1,29 +1,18 @@
 module Webrat #:nodoc:
   module MIME #:nodoc:
+    MIME_TYPES = Rack::Mime::MIME_TYPES.dup.merge(
+      ".multipart_form"   => "multipart/form-data",
+      ".url_encoded_form" => "application/x-www-form-urlencoded"
+    ).freeze
 
-    def self.mime_type(string_or_symbol) #:nodoc:
-      if string_or_symbol.is_a?(String)
-        string_or_symbol
-      else
-        case string_or_symbol
-        when :text              then "text/plain"
-        when :html              then "text/html"
-        when :js                then "text/javascript"
-        when :css               then "text/css"
-        when :ics               then "text/calendar"
-        when :csv               then "text/csv"
-        when :xml               then "application/xml"
-        when :rss               then "application/rss+xml"
-        when :atom              then "application/atom+xml"
-        when :yaml              then "application/x-yaml"
-        when :multipart_form    then "multipart/form-data"
-        when :url_encoded_form  then "application/x-www-form-urlencoded"
-        when :json              then "application/json"
-        else
-          raise ArgumentError.new("Invalid Mime type: #{string_or_symbol.inspect}")
-        end
-      end
+    def mime_type(type)
+      return type if type.nil? || type.to_s.include?("/")
+      type = ".#{type}" unless type.to_s[0] == ?.
+      MIME_TYPES.fetch(type) { |type|
+        raise ArgumentError.new("Invalid Mime type: #{type}")
+      }
     end
 
+    module_function :mime_type
   end
 end

data/lib/webrat/core/session.rb

@@ -13,26 +13,30 @@ module Webrat
   end
 
   def self.session_class
+    if Webrat.configuration.mode == :selenium
+      SeleniumSession
+    else
+      Session
+    end
+  end
+
+  def self.adapter_class
     case Webrat.configuration.mode
     when :rails
-      RailsSession
+      RailsAdapter
     when :merb
-      MerbSession
+      MerbAdapter
     when :rack
-      RackSession
+      RackAdapter
     when :rack_test
       warn("The :rack_test mode is deprecated. Please use :rack instead")
       require "webrat/rack"
-      RackSession
+      RackAdapter
     when :sinatra
       warn("The :sinatra mode is deprecated. Please use :rack instead")
-      SinatraSession
-    when :selenium
-      SeleniumSession
-    when :sinatra
-      SinatraSession
+      SinatraAdapter
     when :mechanize
-      MechanizeSession
+      MechanizeAdapter
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -55,6 +59,9 @@ For example:
     extend Forwardable
     include Logging
     include SaveAndOpenPage
+
+    attr_accessor :adapter
+
     attr_reader :current_url
     attr_reader :elements
 
@@ -62,13 +69,12 @@ For example:
       :response_body=, :response_code=,
       :get, :post, :put, :delete
 
-    def initialize(adapter=nil)
+    def initialize(adapter = nil)
+      @adapter         = adapter
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
-      @adapter         = adapter
-
       reset
     end
 

data/lib/webrat/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

data/lib/webrat/{merb_session.rb → merb_adapter.rb}

@@ -3,7 +3,7 @@ require "merb-core"
 require "webrat/merb_multipart_support"
 
 module Webrat
-  class MerbSession #:nodoc:
+  class MerbAdapter #:nodoc:
     include Merb::Test::MakeRequest
 
     # Include Webrat's own version of multipart_post/put because the officially
@@ -74,7 +74,7 @@ module Merb #:nodoc:
   module Test #:nodoc:
     module RequestHelper #:nodoc:
       def request(uri, env = {})
-        @_webrat_session ||= Webrat::MerbSession.new
+        @_webrat_session ||= Webrat::MerbAdapter.new
         @_webrat_session.response = @_webrat_session.request(uri, env)
       end
     end

data/lib/webrat/rack.rb

@@ -1,7 +1,7 @@
 require "rack/test"
 
 module Webrat
-  class RackSession
+  class RackAdapter
     extend Forwardable
 
     def_delegators :@session, :get, :post, :put, :delete

data/lib/webrat/rails.rb

@@ -5,7 +5,7 @@ require "action_controller/integration"
 require "action_controller/record_identifier"
 
 module Webrat
-  class RailsSession #:nodoc:
+  class RailsAdapter #:nodoc:
     include ActionController::RecordIdentifier
 
     attr_reader :integration_session

data/lib/webrat/sinatra.rb

@@ -1,7 +1,7 @@
 require "webrat/rack"
 
 module Webrat
-  class SinatraSession < RackSession
+  class SinatraAdapter < RackAdapter
     def initialize(context)
       app = context.respond_to?(:app) ? context.app : Sinatra::Application
 

data/spec/fakes/{test_session.rb → test_adapter.rb}

@@ -1,12 +1,15 @@
 module Webrat #:nodoc:
-  def self.session_class #:nodoc:
-    TestSession
+  def self.adapter_class #:nodoc:
+    TestAdapter
   end
 
-  class TestSession < Session #:nodoc:
+  class TestAdapter #:nodoc:
     attr_accessor :response_body
     attr_writer :response_code
 
+    def initialize(*args)
+    end
+
     def doc_root
       File.expand_path(File.join(".", "public"))
     end

data/spec/integration/mechanize/Rakefile

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'spec/rake/spectask'
+
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--color']
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end

data/spec/integration/mechanize/config.ru

@@ -0,0 +1,2 @@
+require "sample_app"
+run SampleApp

data/spec/integration/mechanize/sample_app.rb

@@ -0,0 +1,20 @@
+require "rubygems"
+require "sinatra/base"
+
+class SampleApp < Sinatra::Default
+  get "/" do
+    "Hello World"
+  end
+
+  get "/internal_redirect" do
+    redirect URI.join(request.url, "redirected").to_s
+  end
+
+  get "/external_redirect" do
+    redirect "http://example.tst/"
+  end
+
+  get "/redirected" do
+    "Redirected"
+  end
+end

data/spec/integration/mechanize/spec/mechanize_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe "Webrat's Mechanize mode" do
+  it "should work" do
+    response = visit("http://localhost:9292/")
+    response.should contain("Hello World")
+  end
+
+  it "should follow redirects" do
+    response = visit("http://localhost:9292/internal_redirect")
+    response.should contain("Redirected")
+  end
+
+  it "should follow links"
+  it "should submit forms"
+  it "should not follow external redirects" do
+    pending do
+      response = visit("http://localhost:9292/external_redirect")
+      response.should contain("Foo")
+    end
+  end
+end

data/spec/integration/mechanize/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+require "rubygems"
+require "spec"
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
+
+Webrat.configure do |config|
+  config.mode = :mechanize
+end
+
+Spec::Runner.configure do |config|
+  config.include Webrat::Methods
+  config.include Webrat::Matchers
+
+  config.before :suite do
+    if File.exists?("rack.pid")
+      Process.kill("TERM", File.read("rack.pid").to_i)
+    end
+
+    system "rackup --daemonize --pid rack.pid config.ru"
+  end
+
+  config.after :suite do
+    Process.kill("TERM", File.read("rack.pid").to_i)
+  end
+end
+

data/spec/integration/merb/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require "rubygems"
 
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+
 # Add the local gems dir if found within the app root; any dependencies loaded
 # hereafter will try to load from the local gems before loading system gems.
 if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?

data/spec/integration/rack/app.rb

@@ -33,6 +33,14 @@ class RackApp < Sinatra::Base
     @email = params[:email]
     erb :hello
   end
+
+  get "/upload" do
+    erb :uploader
+  end
+
+  post "/upload" do
+    params[:uploaded_file].to_yaml
+  end
 end
 
 __END__
@@ -71,3 +79,11 @@ __END__
 @@ hello
 <p>Hello, <%= @user %></p>
 <p>Your email is: <%= @email %></p>
+
+@@ uploader
+<form action="/upload" method="post">
+  <label>
+    File <input type="file" name="uploaded_file" />
+  </label>
+  <input type="submit" value="Upload">
+</form>

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

@@ -3,7 +3,8 @@ require "test/unit"
 require "rack/test"
 # require "redgreen"
 
-require File.dirname(__FILE__) + "/../../../../lib/webrat"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
 require File.dirname(__FILE__) + "/../app"
 
 Webrat.configure do |config|

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

@@ -46,12 +46,23 @@ class WebratRackTest < Test::Unit::TestCase
     visit "/absolute_redirect"
     assert_contain "spam"
   end
+
+  def test_upload_file
+    visit "/upload"
+    attach_file "File", __FILE__, "text/ruby"
+    click_button "Upload"
+
+    upload = YAML.load(response_body)
+    assert_equal "text/ruby", upload[:type]
+    assert_equal "webrat_rack_test.rb", upload[:filename]
+    assert upload[:tempfile].respond_to?(:read)
+  end
 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)
+    adapter = Webrat::RackAdapter.new(rack_test_session)
     session = Webrat::Session.new(adapter)
 
     session.visit "/foo"

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

@@ -7,7 +7,8 @@ require 'test_help'
 # rescue MissingSourceFile
 # end
 
-require File.dirname(__FILE__) + "/../../../../lib/webrat"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
 
 Webrat.configure do |config|
   config.mode = ENV['WEBRAT_INTEGRATION_MODE'].to_sym

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

@@ -2,7 +2,8 @@ require "rubygems"
 require "test/unit"
 # require "redgreen"
 
-require File.dirname(__FILE__) + "/../../../../lib/webrat"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
 
 Webrat.configure do |config|
   config.mode = :sinatra

data/spec/private/core/configuration_spec.rb

@@ -68,9 +68,9 @@ describe Webrat::Configuration do
     end
   end
 
-  it "should require merb_session when in merb mode" do
+  it "should require merb_adapter when in merb mode" do
     config = Webrat::Configuration.new
-    config.should_receive(:require).with("webrat/merb_session")
+    config.should_receive(:require).with("webrat/merb_adapter")
     config.mode = :merb
   end
 

data/spec/private/core/link_spec.rb

@@ -4,7 +4,7 @@ describe Webrat::Link do
 #  include Webrat::Link
 
   before do
-    webrat_session = mock(Webrat::TestSession)
+    webrat_session = mock(Webrat::TestAdapter)
     @link_text_with_nbsp = 'Link' + [0xA0].pack("U") + 'Text'
   end
 

data/spec/private/core/session_spec.rb

@@ -62,6 +62,11 @@ describe Webrat::Session do
     it "should raise an error if a symbol Mime type is passed that does not exist" do
       lambda { webrat_session.http_accept(:oogabooga) }.should raise_error(ArgumentError)
     end
+
+    it "should recognize a couple of webrat-specific formats" do
+      webrat_session.http_accept(:multipart_form).should == "multipart/form-data"
+      webrat_session.http_accept(:url_encoded_form).should == "application/x-www-form-urlencoded"
+    end
   end
 
   describe "#request_page" do

data/spec/private/mechanize/{mechanize_session_spec.rb → mechanize_adapter_spec.rb}

@@ -2,19 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require "webrat/mechanize"
 
-describe Webrat::MechanizeSession do
+describe Webrat::MechanizeAdapter do
   before :each do
     Webrat.configuration.mode = :mechanize
   end
 
   before(:each) do
-    @mech = Webrat::MechanizeSession.new
-  end
-
-  describe "headers method" do
-    it "should return empty headers for a newly initialized session" do
-      @mech.headers.should == {}
-    end
+    @mech = Webrat::MechanizeAdapter.new
   end
 
   describe "post" do
@@ -34,13 +28,13 @@ describe Webrat::MechanizeSession do
       mechanize = mock(:mechanize)
       WWW::Mechanize.stub!(:new => mechanize)
       mechanize.should_receive(:post).with(url, flattened_data)
-      Webrat::MechanizeSession.new.post(url, data)
+      Webrat::MechanizeAdapter.new.post(url, data)
     end
   end
 
   describe "#absolute_url" do
     before(:each) do
-      @session = Webrat::MechanizeSession.new
+      @session = Webrat::MechanizeAdapter.new
       @session.stub!(:current_url).and_return(absolute_url)
     end
 

data/spec/private/merb/{merb_session_spec.rb → merb_adapter_spec.rb}

@@ -2,9 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 require "webrat/merb"
 
-describe Webrat::MerbSession do
+describe Webrat::MerbAdapter do
   it "should not pass empty params if data is and empty hash" do
-    session = Webrat::MerbSession.new
+    session = Webrat::MerbAdapter.new
     response = OpenStruct.new
     response.status = 200
     session.should_receive(:request).with('url', {:params=> nil, :method=>"GET", :headers=>nil}).and_return(response)
@@ -13,7 +13,7 @@ describe Webrat::MerbSession do
 
   %w{post put delete}.each do |request_method|
     it "should call do request with method #{request_method.upcase} for a #{request_method} call" do
-      session = Webrat::MerbSession.new
+      session = Webrat::MerbAdapter.new
       response = OpenStruct.new
       response.status = 200
 
@@ -24,7 +24,7 @@ describe Webrat::MerbSession do
 
   %w{post put}.each do |request_method|
     it "should call do request with method #{request_method.upcase} with a file attachment" do
-      session = Webrat::MerbSession.new
+      session = Webrat::MerbAdapter.new
       response = OpenStruct.new
       response.status = 200
 
@@ -43,7 +43,7 @@ describe Webrat::MerbSession do
 
   context "a session with a response" do
     before do
-      @session = Webrat::MerbSession.new
+      @session = Webrat::MerbAdapter.new
       @response = OpenStruct.new
       @response.status = 200
       @response.body = 'test response'

data/spec/private/rails/{rails_session_spec.rb → rails_adapter_spec.rb}

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require "webrat/rails"
 
-describe Webrat::RailsSession do
+describe Webrat::RailsAdapter do
   before :each do
     Webrat.configuration.mode = :rails
     @integration_session = mock("integration_session")
@@ -10,35 +10,35 @@ describe Webrat::RailsSession do
 
   it "should delegate response_body to the session response body" do
     @integration_session.stub!(:response => mock("response", :body => "<html>"))
-    Webrat::RailsSession.new(@integration_session).response_body.should == "<html>"
+    Webrat::RailsAdapter.new(@integration_session).response_body.should == "<html>"
   end
 
   it "should delegate response_code to the session response code" do
     @integration_session.stub!(:response => mock("response", :code => "42"))
-    Webrat::RailsSession.new(@integration_session).response_code.should == 42
+    Webrat::RailsAdapter.new(@integration_session).response_code.should == 42
   end
 
   it "should delegate get to the integration session" do
     @integration_session.should_receive(:get).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.get("url", "data", "headers")
   end
 
   it "should delegate post to the integration session" do
     @integration_session.should_receive(:post).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.post("url", "data", "headers")
   end
 
   it "should delegate put to the integration session" do
     @integration_session.should_receive(:put).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.put("url", "data", "headers")
   end
 
   it "should delegate delete to the integration session" do
     @integration_session.should_receive(:delete).with("url", "data", "headers")
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
     rails_session.delete("url", "data", "headers")
   end
 
@@ -46,7 +46,7 @@ describe Webrat::RailsSession do
     it "should pass the full url" do
       @integration_session.stub!(:https!)
       @integration_session.should_receive(:get).with("http://www.example.com/url", "data", "headers")
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("http://www.example.com/url", "data", "headers")
     end
   end
@@ -55,7 +55,7 @@ describe Webrat::RailsSession do
     it "should call #https! with true before the request before passing along the full url" do
       @integration_session.should_receive(:https!).with(true)
       @integration_session.should_receive(:get).with("https://www.example.com/url", "data", "headers")
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("https://www.example.com/url", "data", "headers")
     end
   end
@@ -64,7 +64,7 @@ describe Webrat::RailsSession do
     it "should call #https! with true before the request" do
       @integration_session.stub!(:get)
       @integration_session.should_receive(:https!).with(false)
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("http://www.example.com/url", "data", "headers")
     end
   end
@@ -73,17 +73,17 @@ describe Webrat::RailsSession do
     it "should strip out the anchor" do
       @integration_session.should_receive(:https!).with(false)
       @integration_session.should_receive(:get).with("http://www.example.com/url", "data", "headers")
-      rails_session = Webrat::RailsSession.new(@integration_session)
+      rails_session = Webrat::RailsAdapter.new(@integration_session)
       rails_session.get("http://www.example.com/url#foo", "data", "headers")
     end
   end
 
   it "should provide a saved_page_dir" do
-    Webrat::RailsSession.new(mock("integration session")).should respond_to(:saved_page_dir)
+    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:saved_page_dir)
   end
 
   it "should provide a doc_root" do
-    Webrat::RailsSession.new(mock("integration session")).should respond_to(:doc_root)
+    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
   end
 
   it "should accept an ActiveRecord argument to #within and translate to a selector using dom_id" do
@@ -100,7 +100,7 @@ describe Webrat::RailsSession do
     @integration_session.stub!(:response => response)
     @integration_session.should_receive(:get).with("/page2", {}, nil)
 
-    rails_session = Webrat::RailsSession.new(@integration_session)
+    rails_session = Webrat::RailsAdapter.new(@integration_session)
 
     object = Object.new
     object.stub!(:id => nil)

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ $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")
+require File.expand_path(File.dirname(__FILE__) + "/fakes/test_adapter")
 
 module Webrat
   @@previous_config = nil

data/webrat.gemspec

@@ -5,11 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webrat}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-08-12}
+  s.date = %q{2009-08-18}
+  s.description = %q{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.}
   s.email = %q{bryan@brynary.com}
   s.extra_rdoc_files = [
     "History.txt",
@@ -70,8 +76,8 @@ Gem::Specification.new do |s|
      "lib/webrat/core_extensions/tcp_socket.rb",
      "lib/webrat/mechanize.rb",
      "lib/webrat/merb.rb",
+     "lib/webrat/merb_adapter.rb",
      "lib/webrat/merb_multipart_support.rb",
-     "lib/webrat/merb_session.rb",
      "lib/webrat/rack.rb",
      "lib/webrat/rails.rb",
      "lib/webrat/rspec-rails.rb",
@@ -99,7 +105,12 @@ Gem::Specification.new do |s|
      "lib/webrat/selenium/selenium_session.rb",
      "lib/webrat/selenium/silence_stream.rb",
      "lib/webrat/sinatra.rb",
-     "spec/fakes/test_session.rb",
+     "spec/fakes/test_adapter.rb",
+     "spec/integration/mechanize/Rakefile",
+     "spec/integration/mechanize/config.ru",
+     "spec/integration/mechanize/sample_app.rb",
+     "spec/integration/mechanize/spec/mechanize_spec.rb",
+     "spec/integration/mechanize/spec/spec_helper.rb",
      "spec/integration/merb/.gitignore",
      "spec/integration/merb/Rakefile",
      "spec/integration/merb/app/controllers/application.rb",
@@ -188,12 +199,12 @@ Gem::Specification.new do |s|
      "spec/private/core/link_spec.rb",
      "spec/private/core/logging_spec.rb",
      "spec/private/core/session_spec.rb",
-     "spec/private/mechanize/mechanize_session_spec.rb",
+     "spec/private/mechanize/mechanize_adapter_spec.rb",
      "spec/private/merb/attaches_file_spec.rb",
-     "spec/private/merb/merb_session_spec.rb",
+     "spec/private/merb/merb_adapter_spec.rb",
      "spec/private/nokogiri_spec.rb",
      "spec/private/rails/attaches_file_spec.rb",
-     "spec/private/rails/rails_session_spec.rb",
+     "spec/private/rails/rails_adapter_spec.rb",
      "spec/private/selenium/application_servers/rails_spec.rb",
      "spec/public/basic_auth_spec.rb",
      "spec/public/check_spec.rb",
@@ -235,7 +246,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{Ruby Acceptance Testing for Web applications}
   s.test_files = [
-    "spec/fakes/test_session.rb",
+    "spec/fakes/test_adapter.rb",
+     "spec/integration/mechanize/sample_app.rb",
+     "spec/integration/mechanize/spec/mechanize_spec.rb",
+     "spec/integration/mechanize/spec/spec_helper.rb",
      "spec/integration/merb/app/controllers/application.rb",
      "spec/integration/merb/app/controllers/exceptions.rb",
      "spec/integration/merb/app/controllers/testing.rb",
@@ -287,12 +301,12 @@ Gem::Specification.new do |s|
      "spec/private/core/link_spec.rb",
      "spec/private/core/logging_spec.rb",
      "spec/private/core/session_spec.rb",
-     "spec/private/mechanize/mechanize_session_spec.rb",
+     "spec/private/mechanize/mechanize_adapter_spec.rb",
      "spec/private/merb/attaches_file_spec.rb",
-     "spec/private/merb/merb_session_spec.rb",
+     "spec/private/merb/merb_adapter_spec.rb",
      "spec/private/nokogiri_spec.rb",
      "spec/private/rails/attaches_file_spec.rb",
-     "spec/private/rails/rails_session_spec.rb",
+     "spec/private/rails/rails_adapter_spec.rb",
      "spec/private/selenium/application_servers/rails_spec.rb",
      "spec/public/basic_auth_spec.rb",
      "spec/public/check_spec.rb",
@@ -330,10 +344,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.2.0"])
+      s.add_dependency(%q<rack>, [">= 1.0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.2.0"])
+    s.add_dependency(%q<rack>, [">= 1.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-12 00:00:00 -04:00
+date: 2009-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,23 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
-description: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+description: |-
+  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.
 email: bryan@brynary.com
 executables: []
 
@@ -86,8 +102,8 @@ files:
 - lib/webrat/core_extensions/tcp_socket.rb
 - lib/webrat/mechanize.rb
 - lib/webrat/merb.rb
+- lib/webrat/merb_adapter.rb
 - lib/webrat/merb_multipart_support.rb
-- lib/webrat/merb_session.rb
 - lib/webrat/rack.rb
 - lib/webrat/rails.rb
 - lib/webrat/rspec-rails.rb
@@ -115,7 +131,12 @@ files:
 - lib/webrat/selenium/selenium_session.rb
 - lib/webrat/selenium/silence_stream.rb
 - lib/webrat/sinatra.rb
-- spec/fakes/test_session.rb
+- spec/fakes/test_adapter.rb
+- spec/integration/mechanize/Rakefile
+- spec/integration/mechanize/config.ru
+- spec/integration/mechanize/sample_app.rb
+- spec/integration/mechanize/spec/mechanize_spec.rb
+- spec/integration/mechanize/spec/spec_helper.rb
 - spec/integration/merb/.gitignore
 - spec/integration/merb/Rakefile
 - spec/integration/merb/app/controllers/application.rb
@@ -204,12 +225,12 @@ files:
 - spec/private/core/link_spec.rb
 - spec/private/core/logging_spec.rb
 - spec/private/core/session_spec.rb
-- spec/private/mechanize/mechanize_session_spec.rb
+- spec/private/mechanize/mechanize_adapter_spec.rb
 - spec/private/merb/attaches_file_spec.rb
-- spec/private/merb/merb_session_spec.rb
+- spec/private/merb/merb_adapter_spec.rb
 - spec/private/nokogiri_spec.rb
 - spec/private/rails/attaches_file_spec.rb
-- spec/private/rails/rails_session_spec.rb
+- spec/private/rails/rails_adapter_spec.rb
 - spec/private/selenium/application_servers/rails_spec.rb
 - spec/public/basic_auth_spec.rb
 - spec/public/check_spec.rb
@@ -272,7 +293,10 @@ signing_key:
 specification_version: 3
 summary: Ruby Acceptance Testing for Web applications
 test_files: 
-- spec/fakes/test_session.rb
+- spec/fakes/test_adapter.rb
+- spec/integration/mechanize/sample_app.rb
+- spec/integration/mechanize/spec/mechanize_spec.rb
+- spec/integration/mechanize/spec/spec_helper.rb
 - spec/integration/merb/app/controllers/application.rb
 - spec/integration/merb/app/controllers/exceptions.rb
 - spec/integration/merb/app/controllers/testing.rb
@@ -324,12 +348,12 @@ test_files:
 - spec/private/core/link_spec.rb
 - spec/private/core/logging_spec.rb
 - spec/private/core/session_spec.rb
-- spec/private/mechanize/mechanize_session_spec.rb
+- spec/private/mechanize/mechanize_adapter_spec.rb
 - spec/private/merb/attaches_file_spec.rb
-- spec/private/merb/merb_session_spec.rb
+- spec/private/merb/merb_adapter_spec.rb
 - spec/private/nokogiri_spec.rb
 - spec/private/rails/attaches_file_spec.rb
-- spec/private/rails/rails_session_spec.rb
+- spec/private/rails/rails_adapter_spec.rb
 - spec/private/selenium/application_servers/rails_spec.rb
 - spec/public/basic_auth_spec.rb
 - spec/public/check_spec.rb