diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-07-06 05:24:50 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-07-06 05:24:50 +0930 |
| commit | 3046c9bbe154aa717a5147091be8b495ed8969c4 (patch) | |
| tree | f58d11fb28bade738a61ac7e55f0467e2e6d84dc | |
| parent | 4d737a41ecf22cfd81930b9cb4637e769d5c1e66 (diff) | |
| parent | 90ebba68366223e5bd5a58f8e82c288713c21c5d (diff) | |
| download | rails-3046c9bbe154aa717a5147091be8b495ed8969c4.tar.gz rails-3046c9bbe154aa717a5147091be8b495ed8969c4.tar.bz2 rails-3046c9bbe154aa717a5147091be8b495ed8969c4.zip | |
Merge pull request #20782 from kaspth/fix-controller-caching-test
Fix the random caching test failure. (Take two)
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index f21dd87400..4f5af85fea 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -381,6 +381,7 @@ class AutomaticCollectionCacheTest < ActionController::TestCase @controller.perform_caching = true @controller.partial_rendered_times = 0 @controller.cache_store = ActiveSupport::Cache::MemoryStore.new + ActionView::PartialRenderer.collection_cache = @controller.cache_store end def test_collection_fetches_cached_views |