diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2017-07-09 13:22:20 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2017-07-09 13:23:00 -0700 |
| commit | bb2d7fcbf58d621e1a607df01aab5ff232255a88 (patch) | |
| tree | 7027118eb9c4c9068659b5207720844b1ec8fa5f /test/service | |
| parent | 18720bc8fbf269184ac6f183a82ed045cc0c1965 (diff) | |
| download | rails-bb2d7fcbf58d621e1a607df01aab5ff232255a88.tar.gz rails-bb2d7fcbf58d621e1a607df01aab5ff232255a88.tar.bz2 rails-bb2d7fcbf58d621e1a607df01aab5ff232255a88.zip | |
Tests: Dir.mktmpdir neatly wraps up tmpdir + join
Diffstat (limited to 'test/service')
| -rw-r--r-- | test/service/disk_service_test.rb | 1 | ||||
| -rw-r--r-- | test/service/mirror_service_test.rb | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/service/disk_service_test.rb b/test/service/disk_service_test.rb index 565acbf516..f7752b25ef 100644 --- a/test/service/disk_service_test.rb +++ b/test/service/disk_service_test.rb @@ -1,4 +1,3 @@ -require "tmpdir" require "service/shared_service_tests" class ActiveStorage::Service::DiskServiceTest < ActiveSupport::TestCase diff --git a/test/service/mirror_service_test.rb b/test/service/mirror_service_test.rb index 6fee3cadd2..8bda01f169 100644 --- a/test/service/mirror_service_test.rb +++ b/test/service/mirror_service_test.rb @@ -1,16 +1,15 @@ -require "tmpdir" require "service/shared_service_tests" class ActiveStorage::Service::MirrorServiceTest < ActiveSupport::TestCase mirror_config = (1..3).map do |i| [ "mirror_#{i}", service: "Disk", - root: File.join(Dir.tmpdir, "active_storage_mirror_#{i}") ] + root: Dir.mktmpdir("active_storage_tests_mirror_#{i}") ] end.to_h config = mirror_config.merge \ mirror: { service: "Mirror", primary: 'primary', mirrors: mirror_config.keys }, - primary: { service: "Disk", root: File.join(Dir.tmpdir, "active_storage") } + primary: { service: "Disk", root: Dir.mktmpdir("active_storage_tests_primary") } SERVICE = ActiveStorage::Service.configure :mirror, config |