diff options
| author | utilum <oz@utilum.com> | 2018-03-30 23:53:23 +0200 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2018-03-31 14:40:59 +0100 |
| commit | 0548d655f23aa7ace8a434bf2b29e78cc5afdbf6 (patch) | |
| tree | 8fe39c01f57e4c204dc8764b25dbe27c986789f8 /activesupport | |
| parent | f4680e492331ccf205ca6cc77d9cdf12d315deb0 (diff) | |
| download | rails-0548d655f23aa7ace8a434bf2b29e78cc5afdbf6.tar.gz rails-0548d655f23aa7ace8a434bf2b29e78cc5afdbf6.tar.bz2 rails-0548d655f23aa7ace8a434bf2b29e78cc5afdbf6.zip | |
Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/test/cache/stores/file_store_test.rb | 4 |
1 files changed, 3 insertions, 1 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 |