diff options
| -rw-r--r-- | activesupport/test/cache/stores/file_store_test.rb | 4 | ||||
| -rw-r--r-- | guides/source/active_support_core_extensions.md | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb index c3c35a7bcc..f6855bb308 100644 --- a/activesupport/test/cache/stores/file_store_test.rb +++ b/activesupport/test/cache/stores/file_store_test.rb @@ -68,7 +68,9 @@ class FileStoreTest < ActiveSupport::TestCase def test_filename_max_size key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}" path = @cache.send(:normalize_key, key, {}) - Dir::Tmpname.create(path) do |tmpname, n, opts| + basename = File.basename(path) + dirname = File.dirname(path) + Dir::Tmpname.create(basename, Dir.tmpdir + dirname) do |tmpname, n, opts| assert File.basename(tmpname + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" end end diff --git a/guides/source/active_support_core_extensions.md b/guides/source/active_support_core_extensions.md index 9bedeae5a2..75ad343613 100644 --- a/guides/source/active_support_core_extensions.md +++ b/guides/source/active_support_core_extensions.md @@ -29,7 +29,7 @@ Thus, after a simple require like: require 'active_support' ``` -Objects do not even respond to `blank?`. Let's see how to load its definition. +objects do not even respond to `blank?`. Let's see how to load its definition. #### Cherry-picking a Definition |