Merge remote-tracking branch 'upstream/master'

1 files changed, 19 insertions, 0 deletions

diff --git a/activeresource/test/cases/connection_test.rb b/activeresource/test/cases/connection_test.rb
index 09df0fb678..535107aeef 100644
--- a/activeresource/test/cases/connection_test.rb
+++ b/activeresource/test/cases/connection_test.rb
@@ -2,6 +2,7 @@ require 'abstract_unit'
 
 class ConnectionTest < Test::Unit::TestCase
   ResponseCodeStub = Struct.new(:code)
+  RedirectResponseStub = Struct.new(:code, :Location)
 
   def setup
     @conn = ActiveResource::Connection.new('http://localhost')
@@ -38,6 +39,18 @@ class ConnectionTest < Test::Unit::TestCase
       assert_equal expected, handle_response(expected)
     end
 
+    # 301 is moved permanently (redirect)
+    assert_redirect_raises 301
+
+    # 302 is found (redirect)
+    assert_redirect_raises 302
+
+    # 303 is see other (redirect)
+    assert_redirect_raises 303
+
+    # 307 is temporary redirect
+    assert_redirect_raises 307
+
     # 400 is a bad request (e.g. malformed URI or missing request parameter)
     assert_response_raises ActiveResource::BadRequest, 400
 
@@ -247,6 +260,12 @@ class ConnectionTest < Test::Unit::TestCase
       end
     end
 
+    def assert_redirect_raises(code)
+      assert_raise(ActiveResource::Redirection, "Expected response code #{code} to raise ActiveResource::Redirection") do
+        handle_response RedirectResponseStub.new(code, 'http://example.com/')
+      end
+    end
+
     def handle_response(response)
       @conn.__send__(:handle_response, response)
     end