Permalink
Browse files

Make sure that javascript_include_tag/stylesheet_link_tag methods in

sprockets/helpers/rails_helper.rb discard duplicated assets
  • Loading branch information...
1 parent 7c7fb3a commit 0621ecb20bd76a3d294fbbed73e54fe81a3cb6d2 @jmbejar jmbejar committed May 3, 2012
View
4 actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -31,7 +31,7 @@ def javascript_include_tag(*sources)
else
super(source.to_s, { :src => path_to_asset(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
end
- end.join("\n").html_safe
+ end.uniq.join("\n").html_safe
end
def stylesheet_link_tag(*sources)
@@ -48,7 +48,7 @@ def stylesheet_link_tag(*sources)
else
super(source.to_s, { :href => path_to_asset(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
end
- end.join("\n").html_safe
+ end.uniq.join("\n").html_safe
end
def asset_path(source, options = {})
View
6 actionpack/test/template/sprockets_helper_test.rb
@@ -254,6 +254,9 @@ def compute_host(source, request, options = {})
assert_match %r{<script src="/assets/jquery.plugin.js" type="text/javascript"></script>},
javascript_include_tag('jquery.plugin', :digest => false)
+ assert_match %r{\A<script src="/assets/xmlhr-[0-9a-f]+.js" type="text/javascript"></script>\Z},
+ javascript_include_tag("xmlhr", "xmlhr")
+
@config.assets.compile = true
@config.assets.debug = true
assert_match %r{<script src="/javascripts/application.js" type="text/javascript"></script>},
@@ -301,6 +304,9 @@ def compute_host(source, request, options = {})
assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />},
stylesheet_link_tag(:application, :debug => true)
+ assert_match %r{\A<link href="/assets/style-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />\Z},
+ stylesheet_link_tag("style", "style")
+
@config.assets.compile = true
@config.assets.debug = true
assert_match %r{<link href="/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />},

0 comments on commit 0621ecb

Please sign in to comment.