1 files changed, 27 insertions, 13 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 65c18dfb64..57b45b8f7b 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'abstract_unit'
-require 'active_record_unit'
 
 CACHE_DIR = 'test_cache'
 # Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
@@ -21,7 +20,7 @@ class FragmentCachingMetalTest < ActionController::TestCase
     @controller = FragmentCachingMetalTestController.new
     @controller.perform_caching = true
     @controller.cache_store = @store
-    @params = { controller: 'posts', action: 'index'}
+    @params = { controller: 'posts', action: 'index' }
     @request = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
     @controller.params = @params
@@ -41,7 +40,7 @@ class CachingController < ActionController::Base
 end
 
 class FragmentCachingTestController < CachingController
-  def some_action; end;
+  def some_action; end
 end
 
 class FragmentCachingTest < ActionController::TestCase
@@ -164,6 +163,9 @@ class FunctionalCachingController < CachingController
       format.xml
     end
   end
+
+  def fragment_cached_without_digest
+  end
 end
 
 class FunctionalFragmentCachingTest < ActionController::TestCase
@@ -200,6 +202,15 @@ CACHED
       @store.read("views/test.host/functional_caching/html_fragment_cached_with_partial/#{template_digest("functional_caching/_partial", "html")}"))
   end
 
+  def test_skipping_fragment_cache_digesting
+    get :fragment_cached_without_digest, :format => "html"
+    assert_response :success
+    expected_body = "<body>\n<p>ERB</p>\n</body>\n"
+
+    assert_equal expected_body, @response.body
+    assert_equal "<p>ERB</p>", @store.read("views/nodigest")
+  end
+
   def test_render_inline_before_fragment_caching
     get :inline_fragment_cached
     assert_response :success
@@ -284,17 +295,20 @@ class CacheHelperOutputBufferTest < ActionController::TestCase
   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
+class ViewCacheDependencyTest < ActionController::TestCase
+  class NoDependenciesController < ActionController::Base
+  end
+
+  class HasDependenciesController < ActionController::Base
+    view_cache_dependency { "trombone" }
+    view_cache_dependency { "flute" }
+  end
 
-    ActionController::Base.page_cache_extension = '.rss'
+  def test_view_cache_dependencies_are_empty_by_default
+    assert NoDependenciesController.new.view_cache_dependencies.empty?
+  end
 
-    assert_equal '.rss', ActionController::Base.default_static_extension
-  ensure
-    ActiveSupport::Deprecation.behavior = deprecation_behavior
-    ActionController::Base.default_static_extension = old_extension
+  def test_view_cache_dependencies_are_listed_in_declaration_order
+    assert_equal %w(trombone flute), HasDependenciesController.new.view_cache_dependencies
   end
 end