2 files changed, 9 insertions, 13 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index c94eea9134..543c7b78a1 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -183,7 +183,7 @@ module ActionDispatch
           end
 
           # Assume given controller
-          request = ActionController::TestRequest.new
+          request = ActionController::TestRequest.create
 
           if path =~ %r{://}
             fail_on(URI::InvalidURIError, msg) do
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb
index 06e9abdd62..ad1a7f7109 100644
--- a/actionpack/lib/action_dispatch/testing/test_request.rb
+++ b/actionpack/lib/action_dispatch/testing/test_request.rb
@@ -7,17 +7,19 @@ module ActionDispatch
       'HTTP_HOST'                => 'test.host',
       'REMOTE_ADDR'              => '0.0.0.0',
       'HTTP_USER_AGENT'          => 'Rails Testing',
-      "rack.request.cookie_hash" => {}.with_indifferent_access
     )
 
-    def self.new(env = {})
-      super
+    # Create a new test request with default `env` values
+    def self.create(env = {})
+      env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application
+      env["rack.request.cookie_hash"] ||= {}.with_indifferent_access
+      new(default_env.merge(env))
     end
 
-    def initialize(env = {})
-      env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application
-      super(default_env.merge(env))
+    def self.default_env
+      DEFAULT_ENV
     end
+    private_class_method :default_env
 
     def request_method=(method)
       @env['REQUEST_METHOD'] = method.to_s.upcase
@@ -63,11 +65,5 @@ module ActionDispatch
       @env.delete('action_dispatch.request.accepts')
       @env['HTTP_ACCEPT'] = Array(mime_types).collect(&:to_s).join(",")
     end
-
-    private
-
-    def default_env
-      DEFAULT_ENV
-    end
   end
 end