Merge branch 'rm-deprecate_via_redirect'

1 files changed, 20 insertions, 5 deletions

diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 5c0651bd73..6247bce2d6 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -54,31 +54,46 @@ class SessionTest < ActiveSupport::TestCase
   def test_get_via_redirect
     path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:get, path, args, headers)
-    @session.get_via_redirect(path, args, headers)
+
+    assert_deprecated do
+      @session.get_via_redirect(path, args, headers)
+    end
   end
 
   def test_post_via_redirect
     path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:post, path, args, headers)
-    @session.post_via_redirect(path, args, headers)
+
+    assert_deprecated do
+      @session.post_via_redirect(path, args, headers)
+    end
   end
 
   def test_patch_via_redirect
     path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:patch, path, args, headers)
-    @session.patch_via_redirect(path, args, headers)
+
+    assert_deprecated do
+      @session.patch_via_redirect(path, args, headers)
+    end
   end
 
   def test_put_via_redirect
     path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:put, path, args, headers)
-    @session.put_via_redirect(path, args, headers)
+
+    assert_deprecated do
+      @session.put_via_redirect(path, args, headers)
+    end
   end
 
   def test_delete_via_redirect
     path = "/somepath"; args = {:id => '1'}; headers = {"X-Test-Header" => "testvalue" }
     @session.expects(:request_via_redirect).with(:delete, path, args, headers)
-    @session.delete_via_redirect(path, args, headers)
+
+    assert_deprecated do
+      @session.delete_via_redirect(path, args, headers)
+    end
   end
 
   def test_get