@@ -22,7 +22,6 @@ module Webrat path, data, headers = *args params = data.merge(:env => headers || {}) self.__send__("#{verb}_it", path, params) - request_page(response.location, :get, {}) while response.redirect? end end end lib/webrat/sinatra.rb @@ -10,6 +10,10 @@ end get "/go" do erb :go end + +get "/redirect" do + redirect "/" +end post "/go" do @user = params[:name] spec/integration/sinatra/app.rb @@ -16,4 +16,9 @@ class WebratTest < Test::Unit::TestCase assert response_body.include?("Hello, World") end + + def test_follows_redirects + visit "/redirect" + assert response_body.include?("visit") + end end spec/integration/sinatra/test/webrat_test.rb @@ -4,8 +4,6 @@ describe Webrat::SinatraSession, "API" do before :each do Webrat.configuration.mode = :sinatra @sinatra_session = Webrat::SinatraSession.new - @response = mock("response", :redirect? => false) - @sinatra_session.stub!(:response => @response) end it "should delegate get to get_it" do @@ -27,14 +25,4 @@ describe Webrat::SinatraSession, "API" do @sinatra_session.should_receive(:delete_it).with("url", { :env => "headers" }) @sinatra_session.delete("url", {}, "headers") end - - it "should use Session#request_page to handle redirects" do - @response.should_receive(:redirect?).twice.and_return(true, false) - @response.should_receive(:location).and_return("redirect url") - - @sinatra_session.should_receive(:get_it).with("original url", { :env => "headers" }) - @sinatra_session.should_receive(:request_page).with("redirect url", :get, {}) - - @sinatra_session.get("original url", {}, "headers") - end end \ No newline at end of file spec/private/sinatra/sinatra_session_spec.rb c3120833b0a4fab942e1430088e513783304b2a0 Josh Knowles joshknowles@gmail.com http://github.com/brynary/webrat/commit/34ea3e64b896424b5aa1195610d5e61e5be466cf 34ea3e64b896424b5aa1195610d5e61e5be466cf 2009-01-04T19:34:47-08:00 2009-01-04T19:34:47-08:00 Sinatra integration tests for following redirects 452de5ce8470208a9147859c6f3d9f1d535f8568 Josh Knowles joshknowles@gmail.com