diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 20:21:12 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-01 20:21:12 -0700 |
| commit | c60a4853ab5a4dc5ce644e68ca762d8a29045d4f (patch) | |
| tree | d166078ff31b146683e05ad566c425a896b1c874 | |
| parent | 260c2015b3503a36ed661b319864cdac74f58046 (diff) | |
| parent | fa45401b82a936d9b634b37e63d0491998d76222 (diff) | |
| download | rails-c60a4853ab5a4dc5ce644e68ca762d8a29045d4f.tar.gz rails-c60a4853ab5a4dc5ce644e68ca762d8a29045d4f.tar.bz2 rails-c60a4853ab5a4dc5ce644e68ca762d8a29045d4f.zip | |
Merge pull request #11233 from frodsan/remove_page_cache_extension_method
Remove `page_cache_extension` method
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 10 | ||||
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 15 |
3 files changed, 4 insertions, 25 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 0a8fd27b21..d70fc20cbc 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated `page_cache_extension` config. + + *Francesco Rodriguez* + * Remove deprecated constants from Action Controller: ActionController::AbstractRequest => ActionDispatch::Request diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index ea33d975ef..5352e5ffe2 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -58,16 +58,6 @@ module ActionController config_accessor :default_static_extension self.default_static_extension ||= '.html' - def self.page_cache_extension=(extension) - ActiveSupport::Deprecation.deprecation_warning(:page_cache_extension, :default_static_extension) - self.default_static_extension = extension - end - - def self.page_cache_extension - ActiveSupport::Deprecation.deprecation_warning(:page_cache_extension, :default_static_extension) - default_static_extension - end - config_accessor :perform_caching self.perform_caching = true if perform_caching.nil? diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index e521c6ce96..a67dff5436 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -312,18 +312,3 @@ class ViewCacheDependencyTest < ActionController::TestCase assert_equal %w(trombone flute), HasDependenciesController.new.view_cache_dependencies end end - -class DeprecatedPageCacheExtensionTest < ActiveSupport::TestCase - def test_page_cache_extension_binds_default_static_extension - deprecation_behavior = ActiveSupport::Deprecation.behavior - ActiveSupport::Deprecation.behavior = :silence - old_extension = ActionController::Base.default_static_extension - - ActionController::Base.page_cache_extension = '.rss' - - assert_equal '.rss', ActionController::Base.default_static_extension - ensure - ActiveSupport::Deprecation.behavior = deprecation_behavior - ActionController::Base.default_static_extension = old_extension - end -end |