diff options
author | Steve Klabnik <steve@steveklabnik.com> | 2013-02-26 11:15:29 -0800 |
---|---|---|
committer | Steve Klabnik <steve@steveklabnik.com> | 2013-02-26 11:15:29 -0800 |
commit | 95883ca4b1178a423c68ab5cc4bcac50f06551ec (patch) | |
tree | 02d354c8f402be5ac1eefe27ce3b63e311ebebd3 /activesupport/test/caching_test.rb | |
parent | 2fa9c8881f0c793185071ef6575433df75c6fb14 (diff) | |
parent | b8837066dcaa389c00aaf22565bb6988ded3932e (diff) | |
download | rails-95883ca4b1178a423c68ab5cc4bcac50f06551ec.tar.gz rails-95883ca4b1178a423c68ab5cc4bcac50f06551ec.tar.bz2 rails-95883ca4b1178a423c68ab5cc4bcac50f06551ec.zip |
Merge pull request #9329 from chuckbjones/fix-cache-delete-rc
Fix deletion of empty directories
Diffstat (limited to 'activesupport/test/caching_test.rb')
-rw-r--r-- | activesupport/test/caching_test.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index 5158bbc196..ede08e23d5 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -672,6 +672,18 @@ class FileStoreTest < ActiveSupport::TestCase end end + def test_delete_does_not_delete_empty_parent_dir + sub_cache_dir = File.join(cache_dir, 'subdir/') + sub_cache_store = ActiveSupport::Cache::FileStore.new(sub_cache_dir) + assert_nothing_raised(Exception) do + assert sub_cache_store.write('foo', 'bar') + assert sub_cache_store.delete('foo') + end + assert File.exist?(cache_dir), "Parent of top level cache dir was deleted!" + assert File.exist?(sub_cache_dir), "Top level cache dir was deleted!" + assert Dir.entries(sub_cache_dir).reject {|f| ActiveSupport::Cache::FileStore::EXCLUDED_DIRS.include?(f)}.empty? + end + def test_log_exception_when_cache_read_fails File.expects(:exist?).raises(StandardError, "failed") @cache.send(:read_entry, "winston", {}) |