diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-08 16:09:49 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-08 16:09:49 -0700 |
commit | 78a5124bf09d0cd285d4d1a6242bd67badb2f621 (patch) | |
tree | 9514761d8dec2abc98ea10ef6a8ca86fb9b5cf42 /actionpack/lib/action_dispatch | |
parent | db41f33d7c9ec436b78d2eb3afa96c9afcc9cca5 (diff) | |
download | rails-78a5124bf09d0cd285d4d1a6242bd67badb2f621.tar.gz rails-78a5124bf09d0cd285d4d1a6242bd67badb2f621.tar.bz2 rails-78a5124bf09d0cd285d4d1a6242bd67badb2f621.zip |
add a new constructor for allocating test requests
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/testing/test_request.rb | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 48765fe83c..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 = build_request({}, ActionController::TestRequest.new_session) + 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 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 |