aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-13 15:16:53 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-13 15:18:21 -0700
commit82afaa06861d03f6a2887d40e40c0ded76db88db (patch)
tree1bc9c22cb01f00effcfbfaac4479215d22bedc67 /railties
parent11870117c6d9231b79e8125218728423e9dff207 (diff)
downloadrails-82afaa06861d03f6a2887d40e40c0ded76db88db.tar.gz
rails-82afaa06861d03f6a2887d40e40c0ded76db88db.tar.bz2
rails-82afaa06861d03f6a2887d40e40c0ded76db88db.zip
Provide a way to access to assets without using the digest, useful for static files and emails
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG3
-rw-r--r--railties/test/application/assets_test.rb2
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 6ed76974b4..9ba93d6130 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -12,6 +12,9 @@
*Rails 3.1.0 (unreleased)*
+* Provide a way to access to assets without using the digest, useful for
+static files and emails. [Santiago Pastorino]
+
* The default database schema file is written as UTF-8. [Aaron Patterson]
* Generated apps with --dev or --edge flags depend on git versions of
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 0901c6df3d..9245532e17 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -58,7 +58,9 @@ module ApplicationTests
Dir.chdir(app_path){ `bundle exec rake assets:precompile` }
end
files = Dir["#{app_path}/public/assets/application-*.js"]
+ files << Dir["#{app_path}/public/assets/application.js"].first
files << Dir["#{app_path}/public/assets/foo/application-*.js"].first
+ files << Dir["#{app_path}/public/assets/foo/application.js"].first
files.each do |file|
assert_not_nil file, "Expected application.js asset to be generated, but none found"
assert_equal "alert()", File.read(file)