@@ -90,9 +90,13 @@ module ActionController #:nodoc: def follow_redirect_with_headers(h = {}) raise "Not a redirect! #{@status} #{@status_message}" unless redirect? - h['HTTP_REFERER'] = current_url if current_url - get(interpret_uri(headers["location"].first), {}, h) + h['HTTP_REFERER'] = request.url + + location = headers["location"] + location = location.first if location.is_a?(Array) + + get(location, {}, h) status end end lib/webrat/rails.rb @@ -131,6 +131,7 @@ describe ActionController::Integration::Session do before :each do Webrat.configuration.mode = :rails @integration_session = ActionController::Integration::Session.new + @integration_session.stub!(:request => mock("request", :url => "http://source.url/")) @integration_session.stub!(:response => mock("response")) end @@ -167,8 +168,6 @@ describe ActionController::Integration::Session do end it "should set the HTTP referer header" do - @integration_session.stub!(:current_url).and_return "http://source.url/" - headers = {} @integration_session.follow_redirect_with_headers(headers) spec/webrat/rails/rails_session_spec.rb 29274f9b4b49f98a6d69f43d1b3a309146912bc3 Josh Knowles joshknowles@gmail.com http://github.com/brynary/webrat/commit/4b6558e7e5c5b5cf9d7d6dae3368715c8d4b9d43 4b6558e7e5c5b5cf9d7d6dae3368715c8d4b9d43 2008-12-28T18:12:34-08:00 2008-12-28T17:53:33-08:00 Properly set referer and redirect to proper location af3383d741c1598c950c94a9916ce497566188c1 Josh Knowles joshknowles@gmail.com