mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Correctly override image_path in sprockets rails_helper
This commit is contained in:
parent
89e98e278a
commit
b8ea31540a
2 changed files with 10 additions and 1 deletions
|
@ -60,9 +60,10 @@ module Sprockets
|
||||||
options[:body] ? "#{path}?body=1" : path
|
options[:body] ? "#{path}?body=1" : path
|
||||||
end
|
end
|
||||||
|
|
||||||
def path_to_image(source)
|
def image_path(source)
|
||||||
asset_paths.compute_public_path(source, asset_prefix)
|
asset_paths.compute_public_path(source, asset_prefix)
|
||||||
end
|
end
|
||||||
|
alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
|
||||||
|
|
||||||
private
|
private
|
||||||
def debug_assets?
|
def debug_assets?
|
||||||
|
|
|
@ -126,6 +126,14 @@ class SprocketsHelperTest < ActionView::TestCase
|
||||||
assert_dom_equal '<img alt="Xml" src="/assets/xml.png" />', image_tag("xml.png")
|
assert_dom_equal '<img alt="Xml" src="/assets/xml.png" />', image_tag("xml.png")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "image_path" do
|
||||||
|
assert_match %r{/assets/logo-[0-9a-f]+.png},
|
||||||
|
image_path("logo.png")
|
||||||
|
|
||||||
|
assert_match %r{/assets/logo-[0-9a-f]+.png},
|
||||||
|
path_to_image("logo.png")
|
||||||
|
end
|
||||||
|
|
||||||
test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
|
test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
|
||||||
@controller = nil
|
@controller = nil
|
||||||
@config.action_controller.asset_host = "assets-%d.example.com"
|
@config.action_controller.asset_host = "assets-%d.example.com"
|
||||||
|
|
Loading…
Reference in a new issue