From fa45401b82a936d9b634b37e63d0491998d76222 Mon Sep 17 00:00:00 2001 From: Francesco Rodriguez Date: Mon, 1 Jul 2013 22:09:11 -0500 Subject: [PATCH] Remove `page_cache_extension` deprecated method --- actionpack/CHANGELOG.md | 4 ++++ actionpack/lib/action_controller/caching.rb | 10 ---------- 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 @@ def cache_configured? 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 @@ def test_view_cache_dependencies_are_listed_in_declaration_order 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 -- GitLab