aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-06-15 22:04:43 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-06-15 22:04:43 +0200
commit374b163999ca45ad258d6e8673df2dd1149494c6 (patch)
tree7f3458ce9bb83813b7ba643e9906830d81a5c983 /actionpack/test
parent7789dfe779c8588fe4e8078077bdf07d436db3e5 (diff)
downloadrails-374b163999ca45ad258d6e8673df2dd1149494c6.tar.gz
rails-374b163999ca45ad258d6e8673df2dd1149494c6.tar.bz2
rails-374b163999ca45ad258d6e8673df2dd1149494c6.zip
Fix flakyness.
Brought on by my own stupidity :)
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/caching_test.rb1
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