mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3092 from asee/master 

Sprockets to use config.assets.prefix, with tests
This commit is contained in:
Santiago Pastorino 2011-09-23 09:34:04 -07:00
parent 36699977f2 c070cc4ab4
commit 5dcb269eb8
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/sprockets/helpers/rails_helper.rb
View File

@ -57,7 +57,7 @@ module Sprockets
def asset_path(source, options = {})
source = source.logical_path if source.respond_to?(:logical_path)
path = asset_paths.compute_public_path(source, 'assets', options.merge(:body => true))
path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true))
options[:body] ? "#{path}?body=1" : path
end

10
actionpack/test/template/sprockets_helper_test.rb
View File

@ -47,6 +47,16 @@ class SprocketsHelperTest < ActionView::TestCase
asset_path("logo.png", :digest => false)
end
test "custom_asset_path" do
@config.assets.prefix = '/s'
assert_match %r{/s/logo-[0-9a-f]+.png},
asset_path("logo.png")
assert_match %r{/s/logo-[0-9a-f]+.png},
asset_path("logo.png", :digest => true)
assert_match %r{/s/logo.png},
asset_path("logo.png", :digest => false)
end
test "asset_path with root relative assets" do
assert_equal "/images/logo",
asset_path("/images/logo")