diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-08-08 07:42:49 -0700 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-08-08 07:42:49 -0700 |
| commit | eabc036496c4f4dbafdcedef7ec8e857fd08641d (patch) | |
| tree | 7b1a7a15dc573186e177ca4903761ff2d3d1b106 /railties/test | |
| parent | 9e5140078fee49f4d1265dd4092f43d5e38128cb (diff) | |
| parent | c0bfb5a63c926abcee8df26ed7b7598ef763463a (diff) | |
| download | rails-eabc036496c4f4dbafdcedef7ec8e857fd08641d.tar.gz rails-eabc036496c4f4dbafdcedef7ec8e857fd08641d.tar.bz2 rails-eabc036496c4f4dbafdcedef7ec8e857fd08641d.zip | |
Merge pull request #2448 from igrigorik/master
Asset pipeline fixes: clear out tmp cache and use environment in digest generation
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/assets_test.rb | 2 |
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 |