From a2148b9d0ad4c4480e88e787b2b98f1b8657ee9c Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Mon, 28 Jun 2021 13:38:48 +0200 Subject: [PATCH] Remove LocalCache in FileStore --- activesupport/lib/active_support/cache/file_store.rb | 1 - activesupport/test/cache/stores/file_store_test.rb | 1 - railties/test/isolation/abstract_unit.rb | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb index bbbfc4f8ab..6ed429ba0a 100644 --- a/activesupport/lib/active_support/cache/file_store.rb +++ b/activesupport/lib/active_support/cache/file_store.rb @@ -11,7 +11,6 @@ module ActiveSupport # FileStore implements the Strategy::LocalCache strategy which implements # an in-memory cache inside of a block. class FileStore < Store - prepend Strategy::LocalCache attr_reader :cache_path DIR_FORMATTER = "%03X" diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb index 2da5e02273..517a0648f6 100644 --- a/activesupport/test/cache/stores/file_store_test.rb +++ b/activesupport/test/cache/stores/file_store_test.rb @@ -32,7 +32,6 @@ class FileStoreTest < ActiveSupport::TestCase include CacheStoreBehavior include CacheStoreVersionBehavior include CacheStoreCoderBehavior - include LocalCacheBehavior include CacheDeleteMatchedBehavior include CacheIncrementDecrementBehavior include CacheInstrumentationBehavior diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 8a4d327285..850b685772 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -204,6 +204,7 @@ module TestHelpers config.hosts << proc { true } config.eager_load = false config.session_store :cookie_store, key: "_myapp_session" + config.cache_store = :mem_cache_store config.active_support.deprecation = :log config.action_controller.allow_forgery_protection = false RUBY