aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/test_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/test_request.rb')
-rw-r--r--actionpack/lib/action_dispatch/testing/test_request.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb
index 0d712f0592..b9d11cb530 100644
--- a/actionpack/lib/action_dispatch/testing/test_request.rb
+++ b/actionpack/lib/action_dispatch/testing/test_request.rb
@@ -10,11 +10,17 @@ module ActionDispatch
"rack.request.cookie_hash" => {}.with_indifferent_access
)
- def initialize(env)
+ # 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
- super(default_env.merge(env))
+ new(default_env.merge(env))
end
+ def self.default_env
+ DEFAULT_ENV
+ end
+ private_class_method :default_env
+
def request_method=(method)
@env['REQUEST_METHOD'] = method.to_s.upcase
end
@@ -59,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