From ab18d37fa4ac0cf2c18948b4b73ea32db009018a Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sun, 10 Apr 2016 15:36:41 +0900 Subject: do not create unnecessary directory This was added in a4c358f, but `config.assets` has been removed in 5172d93. Also, do not use env path to `Sprockets::Cache::FileStore` even `sprockets-rails`. ref: https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/railtie.rb#L129 --- railties/lib/rails/tasks/tmp.rake | 4 +--- 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 -- cgit v1.2.3