diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-08 15:59:30 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-08 15:59:30 -0700 |
| commit | db41f33d7c9ec436b78d2eb3afa96c9afcc9cca5 (patch) | |
| tree | 9edcf50045e9aaaf9cbc7b7aa0aeb0bb36b53332 /actionpack/lib/action_dispatch/testing | |
| parent | 3cae6bc5fc8765b5a06fd3d123528159d1f850b7 (diff) | |
| download | rails-db41f33d7c9ec436b78d2eb3afa96c9afcc9cca5.tar.gz rails-db41f33d7c9ec436b78d2eb3afa96c9afcc9cca5.tar.bz2 rails-db41f33d7c9ec436b78d2eb3afa96c9afcc9cca5.zip | |
make `env` a required parameter
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/test_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb index b40da46703..0d712f0592 100644 --- a/actionpack/lib/action_dispatch/testing/test_request.rb +++ b/actionpack/lib/action_dispatch/testing/test_request.rb @@ -10,7 +10,7 @@ module ActionDispatch "rack.request.cookie_hash" => {}.with_indifferent_access ) - def initialize(env = {}) + def initialize(env) env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application super(default_env.merge(env)) end |