diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-08-29 00:24:52 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-08-29 00:24:52 -0700 |
| commit | f84fc39e2ad4195a7002d92c9bb7ead78f3d57b2 (patch) | |
| tree | 9cb2cd77a04211048636455c136cbfb6e0c08e0a /actionpack/lib/action_dispatch/testing/test_request.rb | |
| parent | 58d35f62110d4280818d49f6a76b3bdaa1ee217a (diff) | |
| parent | 728e925735d6532d1acd586f9dde30c499f91344 (diff) | |
| download | rails-f84fc39e2ad4195a7002d92c9bb7ead78f3d57b2.tar.gz rails-f84fc39e2ad4195a7002d92c9bb7ead78f3d57b2.tar.bz2 rails-f84fc39e2ad4195a7002d92c9bb7ead78f3d57b2.zip | |
Merge pull request #7474 from steveklabnik/backport_89ebd28
Backport 89ebd28 to 3-2-stable
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, 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 7280e9a93b..cf789dc901 100644 --- a/actionpack/lib/action_dispatch/testing/test_request.rb +++ b/actionpack/lib/action_dispatch/testing/test_request.rb @@ -12,7 +12,7 @@ module ActionDispatch end def initialize(env = {}) - env = Rails.application.env_config.merge(env) if defined?(Rails.application) + env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application super(DEFAULT_ENV.merge(env)) self.host = 'test.host' |