From bf12c35087b1112b37340274104ff1ec62b3c118 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 2 Jul 2013 22:59:59 -0300 Subject: [PATCH] Remove deprecated Rails application fallback for integration testing Set ActionDispatch.test_app instead. --- actionpack/CHANGELOG.md | 5 +++++ 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