diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-05 10:52:47 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-05 12:00:24 +0200 |
| commit | 6690d662920f0db854f7303cd2a5a36c72299199 (patch) | |
| tree | 9e531ce7d2945b5eb0ce06e63277cc06361b37c0 /actionpack/lib/action_dispatch/testing/test_request.rb | |
| parent | 5c8b4c6e231257bc08d32722e098927885e5e74d (diff) | |
| download | rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.gz rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.bz2 rails-6690d662920f0db854f7303cd2a5a36c72299199.zip | |
Rename config.cookie_secret to config.secret_token and pass it as configuration in request.env. This is another step forward removing global configuration.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/test_request.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/test_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb index 090e03cf44..b3e67f6e36 100644 --- a/actionpack/lib/action_dispatch/testing/test_request.rb +++ b/actionpack/lib/action_dispatch/testing/test_request.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/object/blank' +require 'active_support/core_ext/hash/reverse_merge' module ActionDispatch class TestRequest < Request @@ -9,6 +10,7 @@ module ActionDispatch end def initialize(env = {}) + env = Rails.application.env_defaults.merge(env) if defined?(Rails.application) super(DEFAULT_ENV.merge(env)) self.host = 'test.host' |