diff options
| author | Jorge Bejar <jorge@wyeworks.com> | 2012-05-03 19:07:03 -0300 |
|---|---|---|
| committer | Jorge Bejar <jorge@wyeworks.com> | 2012-05-03 19:07:03 -0300 |
| commit | 0621ecb20bd76a3d294fbbed73e54fe81a3cb6d2 (patch) | |
| tree | 996d4c655c871d05ce932d8009c6ae74c30fee2c | |
| parent | 7c7fb3a862651d87c4071e40a1799b973f626b11 (diff) | |
| download | rails-0621ecb20bd76a3d294fbbed73e54fe81a3cb6d2.tar.gz rails-0621ecb20bd76a3d294fbbed73e54fe81a3cb6d2.tar.bz2 rails-0621ecb20bd76a3d294fbbed73e54fe81a3cb6d2.zip | |
Make sure that javascript_include_tag/stylesheet_link_tag methods in
sprockets/helpers/rails_helper.rb discard duplicated assets
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 3402343494..4e11221842 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -31,7 +31,7 @@ module Sprockets 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 @@ module Sprockets 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 = {}) diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index 1c591bdcc2..fc3c87a72e 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -254,6 +254,9 @@ class SprocketsHelperTest < ActionView::TestCase 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 @@ class SprocketsHelperTest < ActionView::TestCase 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" />}, |