Merge pull request #30789 from erichmachado/file-store-cache-cleanup-fix

Fixes ActiveSupport::Cache::FileStore#cleanup bug which prevented it from removing expired entries

activesupport/lib/active_support/cache/file_store.rb

@@ -39,9 +39,8 @@ def clear(options = nil)
       def cleanup(options = nil)
         options = merged_options(options)
         search_dir(cache_path) do |fname|
-          key = file_path_key(fname)
-          entry = read_entry(key, options)
-          delete_entry(key, options) if entry && entry.expired?
+          entry = read_entry(fname, options)
+          delete_entry(fname, options) if entry && entry.expired?
         end
       end
 

activesupport/test/cache/stores/file_store_test.rb

@@ -118,6 +118,7 @@ def test_cleanup_removes_all_expired_entries
       assert_not @cache.exist?("foo")
       assert @cache.exist?("baz")
       assert @cache.exist?("quux")
+      assert_equal 2, Dir.glob(File.join(cache_dir, "**")).size
     end
   end