From b8553274439d34568a4c16031ed86ac6d111681d Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Mon, 26 Sep 2011 11:20:30 -0300 Subject: image_tag should use /assets if asset pipelining is turned on. Closes #3126 --- actionpack/lib/sprockets/helpers/rails_helper.rb | 4 ++++ actionpack/test/template/sprockets_helper_test.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index fe822b338e..62bfcb24dd 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -60,6 +60,10 @@ module Sprockets options[:body] ? "#{path}?body=1" : path end + def path_to_image(source) + asset_paths.compute_public_path(source, asset_prefix) + end + private def debug_assets? compile_assets? && (Rails.application.config.assets.debug || params[:debug_assets]) diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index a44a16750f..cac6adaaa4 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -122,6 +122,10 @@ class SprocketsHelperTest < ActionView::TestCase end end + test "image_tag" do + assert_dom_equal 'Xml', image_tag("xml.png") + end + test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do @controller = nil @config.action_controller.asset_host = "assets-%d.example.com" -- cgit v1.2.3