aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/template
diff options
context:
space:
mode:
authorNathan Stitt <nathan@stitt.org>2013-08-01 13:10:36 -0500
committerNathan Stitt <nathan@stitt.org>2013-08-03 09:30:06 -0500
commit0855f041df5a46c2f3fd0820864e4139eb37a6c4 (patch)
tree602422e6fab7cb03434cb82e073111669e0bc97a /actionview/test/template
parent51c61cfbc8ade02afbda319f9a61dda65dcb98ec (diff)
downloadrails-0855f041df5a46c2f3fd0820864e4139eb37a6c4.tar.gz
rails-0855f041df5a46c2f3fd0820864e4139eb37a6c4.tar.bz2
rails-0855f041df5a46c2f3fd0820864e4139eb37a6c4.zip
Add "extname" option to javascript_include_tag
ActionView::Helpers.asset_path is where the logic for javascript_include_tag resides. It takes an extname option for specifying the extension or false to not append it. This exposes that option to javascript_include_tag. Without the option files that didn't end with ".js" would get the extension appended to them. This broke JST templates and other file types that should be interpreted as JavaScript but who's file extension isn't ".js"
Diffstat (limited to 'actionview/test/template')
-rw-r--r--actionview/test/template/javascript_helper_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionview/test/template/javascript_helper_test.rb b/actionview/test/template/javascript_helper_test.rb
index de6a6eaab3..4703111741 100644
--- a/actionview/test/template/javascript_helper_test.rb
+++ b/actionview/test/template/javascript_helper_test.rb
@@ -51,6 +51,13 @@ class JavaScriptHelperTest < ActionView::TestCase
assert_equal 'foo', output_buffer, 'javascript_tag without a block should not concat to output_buffer'
end
+ # Setting the :extname option will control what extension (if any) is appended to the url for assets
+ def test_javascript_include_tag
+ assert_dom_equal "<script src='/foo.js'></script>", javascript_include_tag('/foo')
+ assert_dom_equal "<script src='/foo'></script>", javascript_include_tag('/foo', extname: false )
+ assert_dom_equal "<script src='/foo.bar'></script>", javascript_include_tag('/foo', extname: '.bar' )
+ end
+
def test_javascript_tag_with_options
assert_dom_equal "<script id=\"the_js_tag\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>",
javascript_tag("alert('hello')", :id => "the_js_tag")