diff options
| author | lest <just.lest@gmail.com> | 2011-11-22 16:39:07 +0300 |
|---|---|---|
| committer | lest <just.lest@gmail.com> | 2011-11-22 16:39:07 +0300 |
| commit | aa491f6a9c90641a2d4115420b14e45514962834 (patch) | |
| tree | 16463fb18a82f45118469fcfd439c1854ac2dcaa | |
| parent | 8cae31c800f281212c9c5b5ac0ea2be98c4aa611 (diff) | |
| download | rails-aa491f6a9c90641a2d4115420b14e45514962834.tar.gz rails-aa491f6a9c90641a2d4115420b14e45514962834.tar.bz2 rails-aa491f6a9c90641a2d4115420b14e45514962834.zip | |
javascript_include_tag should add '.js' to sources that contain '.'
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index ddf9b08b54..1ebe7f68f7 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -154,7 +154,7 @@ module Sprockets end def rewrite_extension(source, dir, ext) - if ext && File.extname(source).empty? + if ext && File.extname(source) != ".#{ext}" "#{source}.#{ext}" else source diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index db69f95130..26a504beb8 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -217,6 +217,9 @@ class SprocketsHelperTest < ActionView::TestCase assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>}, javascript_include_tag(:application, :debug => true) + assert_match %r{<script src="/assets/jquery.plugin.js" type="text/javascript"></script>}, + javascript_include_tag('jquery.plugin', :digest => false) + @config.assets.compile = true @config.assets.debug = true assert_match %r{<script src="/javascripts/application.js" type="text/javascript"></script>}, |