lib/webrat/rack_test.rb spec/integration/rack/Rakefile spec/integration/rack/rack_app.rb spec/integration/rack/test/test_helper.rb spec/integration/rack/test/webrat_rack_test.rb @@ -106,7 +106,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,7 +140,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 Rakefile @@ -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 lib/webrat/core/methods.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} @@ -122,11 +124,8 @@ For example: url = canonicalize_url(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? @@ -281,6 +280,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 canonicalize_url(response.headers["Location"]) end lib/webrat/core/session.rb 755cf6e508794568c07f29a8a87efd4f8c4d3654 Bryan Helmkamp bryan@brynary.com http://github.com/brynary/webrat/commit/b5254109f1762ce2ec582823f85bfcfa103d4fbc b5254109f1762ce2ec582823f85bfcfa103d4fbc 2009-05-10T21:12:27-07:00 2009-04-14T19:19:57-07:00 Start on Rack::Test integration d1386ab1011382a21a65a822de37ed6f25126a03 Bryan Helmkamp bryan@brynary.com