Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup

Fix FileStore#cleanup to no longer rely on missing each_key method

1 files changed, 12 insertions, 0 deletions

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index df570d485a..16d087ab9d 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -709,6 +709,18 @@ class FileStoreTest < ActiveSupport::TestCase
     @cache.send(:read_entry, "winston", {})
     assert @buffer.string.present?
   end
+
+  def test_cleanup_removes_all_expired_entries
+    time = Time.now
+    @cache.write('foo', 'bar', expires_in: 10)
+    @cache.write('baz', 'qux')
+    @cache.write('quux', 'corge', expires_in: 20)
+    Time.stubs(:now).returns(time + 15)
+    @cache.cleanup
+    assert_not @cache.exist?('foo')
+    assert @cache.exist?('baz')
+    assert @cache.exist?('quux')
+  end
 end
 
 class MemoryStoreTest < ActiveSupport::TestCase