Permalink
Browse files

Merge pull request #6752 from steveklabnik/fix_5680

Respect absolute paths in compute_source_path.
  • Loading branch information...
2 parents 27846d8 + afb053b commit bebfa5c62b6795997bf0ee8830d64e665bc1245b @rafaelfranca rafaelfranca committed Jun 16, 2012
@@ -35,7 +35,13 @@ def compute_public_path(source, dir, options = {})
# Return the filesystem path for the source
def compute_source_path(source, dir, ext)
source = rewrite_extension(source, dir, ext) if ext
- File.join(config.assets_dir, dir, source)
+
+ sources = []
+ sources << config.assets_dir
+ sources << dir unless source[0] == ?/
+ sources << source
+
+ File.join(sources)
end
def is_uri?(path)
@@ -0,0 +1,3 @@
+body {
+background: #000;
+}
@@ -1267,9 +1267,6 @@ def test_caching_stylesheet_link_tag_with_named_paths_and_script_name_when_cachi
assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
end
-
-
-
def test_caching_stylesheet_include_tag_when_caching_off
ENV["RAILS_ASSET_ID"] = ""
config.perform_caching = false
@@ -1298,6 +1295,17 @@ def test_caching_stylesheet_include_tag_when_caching_off
assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'money.css'))
end
+
+ def test_caching_stylesheet_include_tag_with_absolute_uri
+ ENV["RAILS_ASSET_ID"] = ""
+
+ assert_dom_equal(
+ %(<link href="/stylesheets/all.css" media="screen" rel="stylesheet" />),
+ stylesheet_link_tag("/foo/baz", :cache => true)
+ )
+
+ FileUtils.rm(File.join(ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR, 'all.css'))
+ end
end
class AssetTagHelperNonVhostTest < ActionView::TestCase

0 comments on commit bebfa5c

Please sign in to comment.