aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-09-28 15:49:04 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-09-28 15:49:04 -0700
commit2296340e2dbb5a38d68b8998a19dff78a2c767aa (patch)
treec1c63f87b306cdb041fe2dfc78c8981005f67596 /railties/test
parenta7f887258f59e2a94f3dd7f9a05b4726df8441c7 (diff)
parenta4c358f84c183743edec0c5d6ef113d8e1a5500f (diff)
downloadrails-2296340e2dbb5a38d68b8998a19dff78a2c767aa.tar.gz
rails-2296340e2dbb5a38d68b8998a19dff78a2c767aa.tar.bz2
rails-2296340e2dbb5a38d68b8998a19dff78a2c767aa.zip
Merge pull request #7783 from guilleiguaran/namespace-assets-cache-store
Assets cache shouldn't be shared between different environments
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/assets_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 6e9ae6b74e..12223287ba 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -323,7 +323,8 @@ module ApplicationTests
clean_assets!
- files = Dir["#{app_path}/public/assets/**/*", "#{app_path}/tmp/cache/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/*"]
assert_equal 0, files.length, "Expected no assets, but found #{files.join(', ')}"
end