aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorIlya Grigorik <ilya@igvita.com>2011-08-04 19:17:03 -0400
committerIlya Grigorik <ilya@igvita.com>2011-08-04 23:54:22 -0400
commit050c1510b6041a0de21899de1c08d2b816ec0e66 (patch)
treeafbbe05feb9c06e45406425189d611d87fe578b4 /railties
parent04f88d163094a8b5fa56ba8178cec56aa3ea6b79 (diff)
downloadrails-050c1510b6041a0de21899de1c08d2b816ec0e66.tar.gz
rails-050c1510b6041a0de21899de1c08d2b816ec0e66.tar.bz2
rails-050c1510b6041a0de21899de1c08d2b816ec0e66.zip
Clear out tmp/cache when assets:clean is invoked.
Otherwise, if bad data is cached in tmp/clear then the next invocation of assets:precompile (or a regular incoming request) will pickup files from tmp without regenerating them from source.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/assets_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 802b737483..38dd3f5a3f 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -80,7 +80,7 @@ module ApplicationTests
Dir.chdir(app_path){ `bundle exec rake assets:clean` }
end
- files = Dir["#{app_path}/public/assets/**/*"]
+ files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/*"]
assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
end