aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-05 09:35:27 +0200
committerJosé Valim <jose.valim@gmail.com>2011-10-05 09:37:58 +0200
commit4cea4ee6b54fee897b984a3c0288d12ce2d1efe1 (patch)
tree55823863c055ce4004c372347d6ec24ab91cce71 /railties
parent87c57bb88f0eb1462ed31733ebcf3d9a535d8f16 (diff)
downloadrails-4cea4ee6b54fee897b984a3c0288d12ce2d1efe1.tar.gz
rails-4cea4ee6b54fee897b984a3c0288d12ce2d1efe1.tar.bz2
rails-4cea4ee6b54fee897b984a3c0288d12ce2d1efe1.zip
Fix regression when calling helpers inside sprockets.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/assets_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index e38ea30c30..63427c7792 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -28,7 +28,7 @@ module ApplicationTests
end
test "assets routes have higher priority" do
- app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+ app_file "app/assets/javascripts/demo.js.erb", "a = <%= image_path('rails.png').inspect %>;"
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do
@@ -39,7 +39,7 @@ module ApplicationTests
require "#{app_path}/config/environment"
get "/assets/demo.js"
- assert_match "alert()", last_response.body
+ assert_equal 'a = "/assets/rails.png";', last_response.body.strip
end
test "assets do not require compressors until it is used" do