diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/service/disk_service_test.rb | 1 | ||||
-rw-r--r-- | test/service/mirror_service_test.rb | 5 | ||||
-rw-r--r-- | test/test_helper.rb | 5 |
3 files changed, 5 insertions, 6 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 diff --git a/test/test_helper.rb b/test/test_helper.rb index ca1e0cad7e..03593b12c7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -17,7 +17,8 @@ end require "active_storage/service/disk_service" -ActiveStorage::Blob.service = ActiveStorage::Service::DiskService.new(root: File.join(Dir.tmpdir, "active_storage")) +require "tmpdir" +ActiveStorage::Blob.service = ActiveStorage::Service::DiskService.new(root: Dir.mktmpdir("active_storage_tests")) ActiveStorage::Service.logger = ActiveSupport::Logger.new(STDOUT) require "active_storage/verified_key_with_expiration" @@ -47,4 +48,4 @@ ActiveRecord::Base.send :extend, ActiveStorage::Attached::Macros require "global_id" GlobalID.app = "ActiveStorageExampleApp" ActiveRecord::Base.send :include, GlobalID::Identification -SignedGlobalID.verifier = ActiveStorage::VerifiedKeyWithExpiration.verifier
\ No newline at end of file +SignedGlobalID.verifier = ActiveStorage::VerifiedKeyWithExpiration.verifier |