diff options
| author | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-09 09:31:16 -0800 |
|---|---|---|
| committer | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-09 09:31:16 -0800 |
| commit | d0550ff6717f18961493ab065ff2eebed6199525 (patch) | |
| tree | f5ff24082dd79e429b7a33e8fe217ffa3bc0b02b /actionpack/test/controller/log_subscriber_test.rb | |
| parent | d58078d8d65de38d9dca9c629c91e13df291dbb3 (diff) | |
| parent | 5961d6882bc3a6aaa2b3735e7a8cbe3f2fb901af (diff) | |
| download | rails-d0550ff6717f18961493ab065ff2eebed6199525.tar.gz rails-d0550ff6717f18961493ab065ff2eebed6199525.tar.bz2 rails-d0550ff6717f18961493ab065ff2eebed6199525.zip | |
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'actionpack/test/controller/log_subscriber_test.rb')
| -rw-r--r-- | actionpack/test/controller/log_subscriber_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb index f0f106c8ba..be455642de 100644 --- a/actionpack/test/controller/log_subscriber_test.rb +++ b/actionpack/test/controller/log_subscriber_test.rb @@ -98,7 +98,7 @@ class ACLogSubscriberTest < ActionController::TestCase @old_logger = ActionController::Base.logger - @cache_path = File.join Dir.tmpdir, Dir::Tmpname.make_tmpname("tmp", "cache") + @cache_path = Dir.mktmpdir(%w[tmp cache]) @controller.cache_store = :file_store, @cache_path ActionController::LogSubscriber.attach_to :action_controller end |