diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-24 00:02:05 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-24 00:02:05 -0800 |
| commit | 34bbf8428cd5d1cf2bc9c1ce222a84fe5488a34e (patch) | |
| tree | 427e3261c2406776b30f467f0b1e6814a4b670d5 /actionpack/lib/action_dispatch/testing | |
| parent | 9bbe2b800ed87d803a18888b84ba5b73faba2680 (diff) | |
| parent | 5f3b9dec0a03055824fa8187ef260e74d75a75eb (diff) | |
| download | rails-34bbf8428cd5d1cf2bc9c1ce222a84fe5488a34e.tar.gz rails-34bbf8428cd5d1cf2bc9c1ce222a84fe5488a34e.tar.bz2 rails-34bbf8428cd5d1cf2bc9c1ce222a84fe5488a34e.zip | |
Merge pull request #4147 from lest/remove-app-fallback
remove Rails application fallback from AD::IntegrationTest
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 0f1bb9f260..26db8662a8 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -463,9 +463,12 @@ module ActionDispatch @@app = nil def self.app - # DEPRECATE Rails application fallback - # This should be set by the initializer - @@app || (defined?(Rails.application) && Rails.application) || nil + if !@@app && !ActionDispatch.test_app + ActiveSupport::Deprecation.warn "Rails application fallback is deprecated " \ + "and no longer works, please set ActionDispatch.test_app", caller + end + + @@app || ActionDispatch.test_app end def self.app=(app) |