diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-02 22:59:59 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-02 22:59:59 -0300 |
| commit | bf12c35087b1112b37340274104ff1ec62b3c118 (patch) | |
| tree | d3f8f3917a7159ff47c05608bd3fd7fdeeb2b18a /actionpack | |
| parent | b990921f05b641c0d6f1b98c2c2ac19b9cdf9906 (diff) | |
| download | rails-bf12c35087b1112b37340274104ff1ec62b3c118.tar.gz rails-bf12c35087b1112b37340274104ff1ec62b3c118.tar.bz2 rails-bf12c35087b1112b37340274104ff1ec62b3c118.zip | |
Remove deprecated Rails application fallback for integration testing
Set ActionDispatch.test_app instead.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index d70fc20cbc..ee3ff907cc 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,8 @@ +* Remove deprecated Rails application fallback for integration testing, set + `ActionDispatch.test_app` instead. + + *Carlos Antonio da Silva* + * Remove deprecated `page_cache_extension` config. *Francesco Rodriguez* diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 1f899a434c..19332a2bc2 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -489,10 +489,6 @@ module ActionDispatch @@app = nil def self.app - if !@@app && !ActionDispatch.test_app - ActiveSupport::Deprecation.warn "Rails application fallback is deprecated and no longer works, please set ActionDispatch.test_app" - end - @@app || ActionDispatch.test_app end |