diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-03 17:49:11 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-01-03 17:51:10 -0200 |
| commit | 8c129f18d2f3fdacfb932ef9bfa52604084a670f (patch) | |
| tree | 323c9d5f4f48f92498b22a4c7a4a7d00098f3a75 /actionpack | |
| parent | 124536ed9bb843ef81f833006a6a151ab2a94047 (diff) | |
| download | rails-8c129f18d2f3fdacfb932ef9bfa52604084a670f.tar.gz rails-8c129f18d2f3fdacfb932ef9bfa52604084a670f.tar.bz2 rails-8c129f18d2f3fdacfb932ef9bfa52604084a670f.zip | |
Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417
Diffstat (limited to 'actionpack')
| -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 177f7f6747..976ae5a76d 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -69,12 +69,12 @@ module Sprockets alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route def javascript_path(source) - path_to_asset(source) + path_to_asset(source, :ext => 'js') end alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with an javascript_path named route def stylesheet_path(source) - path_to_asset(source) + path_to_asset(source, :ext => 'css') end alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index fb472cfbe5..1c591bdcc2 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -158,6 +158,9 @@ class SprocketsHelperTest < ActionView::TestCase test "javascript_path" do assert_match %r{/assets/application-[0-9a-f]+.js}, + javascript_path("application") + + assert_match %r{/assets/application-[0-9a-f]+.js}, javascript_path("application.js") assert_match %r{/assets/application-[0-9a-f]+.js}, @@ -166,6 +169,9 @@ class SprocketsHelperTest < ActionView::TestCase test "stylesheet_path" do assert_match %r{/assets/application-[0-9a-f]+.css}, + stylesheet_path("application") + + assert_match %r{/assets/application-[0-9a-f]+.css}, stylesheet_path("application.css") assert_match %r{/assets/application-[0-9a-f]+.css}, |