Skip to content
Browse files

Merge pull request #3092 from asee/master

Sprockets to use config.assets.prefix, with tests
  • Loading branch information...
2 parents 3669997 + c070cc4 commit 5dcb269eb8c8730084734e845534d3b9580c40f4 @spastorino spastorino committed Sep 23, 2011
View
2 actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -57,7 +57,7 @@ def stylesheet_link_tag(*sources)
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
View
10 actionpack/test/template/sprockets_helper_test.rb
@@ -47,6 +47,16 @@ def url_for(*args)
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")

0 comments on commit 5dcb269

Please sign in to comment.
Something went wrong with that request. Please try again.