diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-21 15:34:51 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-21 15:34:51 -0700 |
| commit | c5fc159949f19708002ba801438ca5434192b074 (patch) | |
| tree | 3290b1b128063b75722b46c37ade574009e23d97 /actionpack/lib | |
| parent | 03886d817307e091024ff3bd26844447abd8c408 (diff) | |
| parent | 89ebd28d4ec899d840bddbef7711983a1ae2a162 (diff) | |
| download | rails-c5fc159949f19708002ba801438ca5434192b074.tar.gz rails-c5fc159949f19708002ba801438ca5434192b074.tar.bz2 rails-c5fc159949f19708002ba801438ca5434192b074.zip | |
Merge pull request #6429 from marcandre/fix_test_request
Fix bug when Rails.application is defined but is nil. See #881
Diffstat (limited to 'actionpack/lib')
| -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 d04be2099c..a86b510719 100644 --- a/actionpack/lib/action_dispatch/testing/test_request.rb +++ b/actionpack/lib/action_dispatch/testing/test_request.rb @@ -11,7 +11,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' |