diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-04-10 15:36:41 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-04-10 20:43:07 +0900 |
| commit | ab18d37fa4ac0cf2c18948b4b73ea32db009018a (patch) | |
| tree | a3d239a26108f99bb13f6063507559485ccb81ce /railties | |
| parent | 87c2c070c4cf1b62ac364c53496a2da000fbf9d6 (diff) | |
| download | rails-ab18d37fa4ac0cf2c18948b4b73ea32db009018a.tar.gz rails-ab18d37fa4ac0cf2c18948b4b73ea32db009018a.tar.bz2 rails-ab18d37fa4ac0cf2c18948b4b73ea32db009018a.zip | |
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
Diffstat (limited to 'railties')
| -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 |