diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-06-16 05:38:49 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-06-16 05:38:49 +0930 |
| commit | 34b2eec02c23ec50caae06cd1c95d5d9b3070829 (patch) | |
| tree | 7f3458ce9bb83813b7ba643e9906830d81a5c983 /actionpack/test | |
| parent | 7789dfe779c8588fe4e8078077bdf07d436db3e5 (diff) | |
| parent | 374b163999ca45ad258d6e8673df2dd1149494c6 (diff) | |
| download | rails-34b2eec02c23ec50caae06cd1c95d5d9b3070829.tar.gz rails-34b2eec02c23ec50caae06cd1c95d5d9b3070829.tar.bz2 rails-34b2eec02c23ec50caae06cd1c95d5d9b3070829.zip | |
Merge pull request #20573 from kaspth/fix-caching-test-for-realskies
Fix flakyness.
Diffstat (limited to 'actionpack/test')
| -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 de697858c3..f21dd87400 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -380,6 +380,7 @@ class AutomaticCollectionCacheTest < ActionController::TestCase @controller = CollectionCacheController.new @controller.perform_caching = true @controller.partial_rendered_times = 0 + @controller.cache_store = ActiveSupport::Cache::MemoryStore.new end def test_collection_fetches_cached_views |