2 files changed, 17 insertions, 16 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 69ae5a8468..384254b131 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -122,6 +122,7 @@ module ActionDispatch
       #     params: { ref_id: 14 },
       #     headers: { "X-Test-Header" => "testvalue" }
       def request_via_redirect(http_method, path, *args)
+        ActiveSupport::Deprecation.warn('`request_via_redirect` is deprecated and will be removed in Rails 5.1. Please use `follow_redirect!` manually after the request call for the same behavior.')
         process_with_kwargs(http_method, path, *args)
 
         follow_redirect! while redirect?
@@ -131,35 +132,35 @@ module ActionDispatch
       # Performs a GET request, following any subsequent redirect.
       # See +request_via_redirect+ for more information.
       def get_via_redirect(path, *args)
-        ActiveSupport::Deprecation.warn('`get_via_redirect` is deprecated and will be removed in Rails 5.1. Please use follow_redirect! manually after the request call for the same behavior.')
+        ActiveSupport::Deprecation.warn('`get_via_redirect` is deprecated and will be removed in Rails 5.1. Please use `follow_redirect!` manually after the request call for the same behavior.')
         request_via_redirect(:get, path, *args)
       end
 
       # Performs a POST request, following any subsequent redirect.
       # See +request_via_redirect+ for more information.
       def post_via_redirect(path, *args)
-        ActiveSupport::Deprecation.warn('`post_via_redirect` is deprecated and will be removed in Rails 5.1. Please use follow_redirect! manually after the request call for the same behavior.')
+        ActiveSupport::Deprecation.warn('`post_via_redirect` is deprecated and will be removed in Rails 5.1. Please use `follow_redirect!` manually after the request call for the same behavior.')
         request_via_redirect(:post, path, *args)
       end
 
       # Performs a PATCH request, following any subsequent redirect.
       # See +request_via_redirect+ for more information.
       def patch_via_redirect(path, *args)
-        ActiveSupport::Deprecation.warn('`patch_via_redirect` is deprecated and will be removed in Rails 5.1. Please use follow_redirect! manually after the request call for the same behavior.')
+        ActiveSupport::Deprecation.warn('`patch_via_redirect` is deprecated and will be removed in Rails 5.1. Please use `follow_redirect!` manually after the request call for the same behavior.')
         request_via_redirect(:patch, path, *args)
       end
 
       # Performs a PUT request, following any subsequent redirect.
       # See +request_via_redirect+ for more information.
       def put_via_redirect(path, *args)
-        ActiveSupport::Deprecation.warn('`put_via_redirect` is deprecated and will be removed in Rails 5.1. Please use follow_redirect! manually after the request call for the same behavior.')
+        ActiveSupport::Deprecation.warn('`put_via_redirect` is deprecated and will be removed in Rails 5.1. Please use `follow_redirect!` manually after the request call for the same behavior.')
         request_via_redirect(:put, path, *args)
       end
 
       # Performs a DELETE request, following any subsequent redirect.
       # See +request_via_redirect+ for more information.
       def delete_via_redirect(path, *args)
-        ActiveSupport::Deprecation.warn('`delete_via_redirect` is deprecated and will be removed in Rails 5.1. Please use follow_redirect! manually after the request call for the same behavior.')
+        ActiveSupport::Deprecation.warn('`delete_via_redirect` is deprecated and will be removed in Rails 5.1. Please use `follow_redirect!` manually after the request call for the same behavior.')
         request_via_redirect(:delete, path, *args)
       end
     end
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb
index ad1a7f7109..46523a8600 100644
--- a/actionpack/lib/action_dispatch/testing/test_request.rb
+++ b/actionpack/lib/action_dispatch/testing/test_request.rb
@@ -22,23 +22,23 @@ module ActionDispatch
     private_class_method :default_env
 
     def request_method=(method)
-      @env['REQUEST_METHOD'] = method.to_s.upcase
+      set_header('REQUEST_METHOD', method.to_s.upcase)
     end
 
     def host=(host)
-      @env['HTTP_HOST'] = host
+      set_header('HTTP_HOST', host)
     end
 
     def port=(number)
-      @env['SERVER_PORT'] = number.to_i
+      set_header('SERVER_PORT', number.to_i)
     end
 
     def request_uri=(uri)
-      @env['REQUEST_URI'] = uri
+      set_header('REQUEST_URI', uri)
     end
 
     def path=(path)
-      @env['PATH_INFO'] = path
+      set_header('PATH_INFO', path)
     end
 
     def action=(action_name)
@@ -46,24 +46,24 @@ module ActionDispatch
     end
 
     def if_modified_since=(last_modified)
-      @env['HTTP_IF_MODIFIED_SINCE'] = last_modified
+      set_header('HTTP_IF_MODIFIED_SINCE', last_modified)
     end
 
     def if_none_match=(etag)
-      @env['HTTP_IF_NONE_MATCH'] = etag
+      set_header('HTTP_IF_NONE_MATCH', etag)
     end
 
     def remote_addr=(addr)
-      @env['REMOTE_ADDR'] = addr
+      set_header('REMOTE_ADDR', addr)
     end
 
     def user_agent=(user_agent)
-      @env['HTTP_USER_AGENT'] = user_agent
+      set_header('HTTP_USER_AGENT', user_agent)
     end
 
     def accept=(mime_types)
-      @env.delete('action_dispatch.request.accepts')
-      @env['HTTP_ACCEPT'] = Array(mime_types).collect(&:to_s).join(",")
+      delete_header('action_dispatch.request.accepts')
+      set_header('HTTP_ACCEPT', Array(mime_types).collect(&:to_s).join(","))
     end
   end
 end