@@ -110,7 +110,7 @@ For example: @http_method = http_method @data = data - request_page(response.location, :get, data) if redirect? + request_page(response.headers["Location"], :get, data) if redirect? return response end lib/webrat/core/session.rb @@ -42,11 +42,6 @@ module Webrat :params => (data && data.any?) ? data : nil, :headers => headers, :method => method) - follow_redirect - end - - def follow_redirect - self.get(@response.headers['Location'], nil, @response.headers) if @response.status == 302 end end @@ -59,10 +54,6 @@ module Merb #:nodoc: @_webrat_session ||= Webrat::MerbSession.new @_webrat_session.response = @_webrat_session.request(uri, env) end - - def follow_redirect - @_webrat_session.follow_redirect - end end end end lib/webrat/merb.rb @@ -7,4 +7,8 @@ class Testing < Application def submit_form end + def redirect_to_root + redirect "/" + end + end \ No newline at end of file spec/integration/merb/app/controllers/testing.rb @@ -28,4 +28,5 @@ Merb.logger.info("Compiling routes...") Merb::Router.prepare do match("/").to(:controller => "testing", :action => "show_form") + match("/redirect").to(:controller => "testing", :action => "redirect_to_root") end \ No newline at end of file spec/integration/merb/config/router.rb @@ -5,7 +5,7 @@ describe "Webrat" do response = visit "/" response.should contain("Webrat Form") end - + it "should submit forms" do visit "/" fill_in "Text field", :with => "Hello" @@ -13,5 +13,9 @@ describe "Webrat" do select "January" click_button "Test" end - + + it "should follow redirects" do + response = visit "/redirect" + response.should contain("Webrat Form") + end end \ No newline at end of file spec/integration/merb/spec/webrat_spec.rb @@ -1,10 +1,14 @@ class WebratController < ApplicationController - + def form end - + def submit render :text => "OK" end - + + def redirect + redirect_to :submit + end + end \ No newline at end of file spec/integration/rails/app/controllers/webrat_controller.rb @@ -1,6 +1,8 @@ ActionController::Routing::Routes.draw do |map| map.with_options :controller => "webrat" do |webrat| - webrat.submit "/submit", :action => "submit" - webrat.root :action => "form" + webrat.submit "/submit", :action => "submit" + webrat.redirect "/redirect", :action => "redirect" + + webrat.root :action => "form" end end spec/integration/rails/config/routes.rb @@ -6,7 +6,7 @@ class WebratTest < ActionController::IntegrationTest assert_tag "Webrat Form" assert response.body.include?("Webrat Form") end - + test "should submit forms" do visit root_path fill_in "Text field", :with => "Hello" @@ -14,4 +14,9 @@ class WebratTest < ActionController::IntegrationTest select "January" click_button "Test" end + + test "should follow redirects" do + visit redirect_path + assert response.body.include?("OK") + end end spec/integration/rails/test/integration/webrat_test.rb @@ -115,7 +115,7 @@ describe Webrat::Session do it "should follow redirects" do webrat_session.should_receive(:redirect?).twice.and_return(true, false) - webrat_session.response.should_receive(:location).once.and_return("/newurl") + webrat_session.response.should_receive(:headers).once.and_return({ "Location" => "/newurl" }) webrat_session.request_page("/oldurl", :get, {}) spec/private/core/session_spec.rb @@ -33,7 +33,7 @@ describe "visit" do it "should follow redirects" do webrat_session.should_receive(:redirect?).twice.and_return(true, false) - webrat_session.response.should_receive(:location).once.and_return("/newurl") + webrat_session.response.should_receive(:headers).once.and_return({ "Location" => "/newurl" }) visit("/oldurl") spec/public/visit_spec.rb e77495bc04cacfb1e7684bd938a7c6d32545130f Josh Knowles joshknowles@gmail.com http://github.com/brynary/webrat/commit/e19b1cc323e8df657a357bfeefe3f68745f80938 e19b1cc323e8df657a357bfeefe3f68745f80938 2008-12-29T20:14:26-08:00 2008-12-29T20:14:26-08:00 Rails and Merb integration tests for following redirects 93e84d96a94005ed0f23ace72e204070cae52f1f Josh Knowles joshknowles@gmail.com