Webrat::Core::Session#redirect? should not mistake a 304 for a redirect.

brynary · Apr 12, 2010 · fd944cc · fd944cc
1 parent 0bbf163
commit fd944cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/webrat/core/session.rb b/lib/webrat/core/session.rb
@@ -155,7 +155,7 @@ def success_code? #:nodoc:
     end
 
     def redirect? #:nodoc:
-      (response_code / 100).to_i == 3
+      response_code != 304 && (response_code / 100).to_i == 3
     end
 
     def internal_redirect?

diff --git a/spec/private/core/session_spec.rb b/spec/private/core/session_spec.rb
@@ -133,6 +133,11 @@ def /(other)
       webrat_session.stub!(:response_code => 200)
       webrat_session.redirect?.should be_false
     end
+
+    it "should return false if the last response was a 304 Not Modified" do
+      webrat_session.stub!(:response_code => 304)
+      webrat_session.redirect?.should be_false
+    end
   end
 
   describe "#internal_redirect?" do