From cbe918093b6ad0994cae0fce014c0d987447d9ab Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Tue, 3 Jan 2012 17:49:11 -0200 Subject: [PATCH] Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417 --- actionpack/lib/sprockets/helpers/rails_helper.rb | 4 ++-- 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 @@ -157,6 +157,9 @@ class SprocketsHelperTest < ActionView::TestCase end 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") @@ -165,6 +168,9 @@ class SprocketsHelperTest < ActionView::TestCase end 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")