Support forwarding headers when following redirects when using the Si…

…natraSession

lib/webrat/sinatra.rb

@@ -11,10 +11,9 @@ class SinatraSession < RackSession #:nodoc:
         path, data, headers = *args
         params = data.merge({:env => headers || {}})
         self.__send__("#{verb}_it", path, params)
-        follow! while @response.redirect?
+        get_it(@response.location, params) while @response.redirect?
       end
     end
-
   end
 end
 

spec/webrat/sinatra/sinatra_spec.rb

@@ -29,6 +29,16 @@
     @sinatra_session.should_receive(:delete_it).with("url", { :env => "headers" })
     @sinatra_session.delete("url", {}, "headers")
   end
+
+  it "should forward headers when following 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(:get_it).with("redirect url", { :env => "headers" })
+
+    @sinatra_session.get("original url", {}, "headers")
+  end
 end
 
 # Hack required to reset configuration mode to play nice with other specs that depend on this being rails