Permalink
Browse files

Merge pull request #11233 from frodsan/remove_page_cache_extension_me…

…thod

Remove `page_cache_extension` method
  • Loading branch information...
2 parents 260c201 + fa45401 commit c60a4853ab5a4dc5ce644e68ca762d8a29045d4f @rafaelfranca rafaelfranca committed Jul 2, 2013
View
4 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
View
10 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?
View
15 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

0 comments on commit c60a485

Please sign in to comment.