diff options
author | José Valim <jose.valim@gmail.com> | 2011-11-22 09:45:11 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-11-22 09:45:11 -0800 |
commit | b13b49ccc17a04836fdc877094eab4c951e69e66 (patch) | |
tree | 314d5f6a9d9fcd9b73043454198d13708477cb78 /actionpack/test | |
parent | 39ecbfdab9868cbd5166a7b0ee5b59c00389e2bd (diff) | |
parent | aa491f6a9c90641a2d4115420b14e45514962834 (diff) | |
download | rails-b13b49ccc17a04836fdc877094eab4c951e69e66.tar.gz rails-b13b49ccc17a04836fdc877094eab4c951e69e66.tar.bz2 rails-b13b49ccc17a04836fdc877094eab4c951e69e66.zip |
Merge pull request #3718 from lest/fix-javascript-include-tag
javascript_include_tag should add '.js' to sources that contain '.'
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 3 |
1 files changed, 3 insertions, 0 deletions
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>}, |