diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-04-10 10:13:17 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-04-10 10:13:17 -0300 |
| commit | 9df157a97f7f02fd12ed6ff82cb97e1edf982a2e (patch) | |
| tree | 26690e9e49d403bd104012b7d4437f72ecd470a3 | |
| parent | 35b19cd1eb95ca0419e1be879fbadf92948369d7 (diff) | |
| parent | ab18d37fa4ac0cf2c18948b4b73ea32db009018a (diff) | |
| download | rails-9df157a97f7f02fd12ed6ff82cb97e1edf982a2e.tar.gz rails-9df157a97f7f02fd12ed6ff82cb97e1edf982a2e.tar.bz2 rails-9df157a97f7f02fd12ed6ff82cb97e1edf982a2e.zip | |
Merge pull request #24486 from y-yagi/do_not_create_unnecessary_directory
do not create unnecessary directory
| -rw-r--r-- | railties/lib/rails/tasks/tmp.rake | 4 | ||||
| -rw-r--r-- | railties/test/application/assets_test.rb | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/railties/lib/rails/tasks/tmp.rake b/railties/lib/rails/tasks/tmp.rake index 9162ef234a..22785da557 100644 --- a/railties/lib/rails/tasks/tmp.rake +++ b/railties/lib/rails/tasks/tmp.rake @@ -5,9 +5,7 @@ namespace :tmp do tmp_dirs = [ 'tmp/cache', 'tmp/sockets', 'tmp/pids', - 'tmp/cache/assets/development', - 'tmp/cache/assets/test', - 'tmp/cache/assets/production' ] + 'tmp/cache/assets' ] tmp_dirs.each { |d| directory d } diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index 11e19eec80..e32eea42b7 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -344,8 +344,7 @@ module ApplicationTests clean_assets! - files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/assets/development/*", - "#{app_path}/tmp/cache/assets/test/*", "#{app_path}/tmp/cache/assets/production/*"] + files = Dir["#{app_path}/public/assets/**/*"] assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}" end |