aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-01-31 03:35:21 -0800
committerJosé Valim <jose.valim@plataformatec.com.br>2012-01-31 03:35:21 -0800
commit175cdd11f4e956113c2123d548528ebc36688946 (patch)
tree93e6a3bf3c9ba449d926e4360d14fcdbdf4e9600
parentb2955edcea63e3daa347dc4e05b9abd380176ac8 (diff)
parentcfea67313525828960717be15b9b52918af33ba9 (diff)
downloadrails-175cdd11f4e956113c2123d548528ebc36688946.tar.gz
rails-175cdd11f4e956113c2123d548528ebc36688946.tar.bz2
rails-175cdd11f4e956113c2123d548528ebc36688946.zip
Merge pull request #4786 from lest/patch-2
fix assets test in 3-2-stable
-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 83a442c94e..ad87d8b6ac 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -64,7 +64,7 @@ module ApplicationTests
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)
+ assert_equal "alert();", File.read(file)
end
end