@@ -538,12 +538,12 @@ module ActionView @source = source @include_host = include_host @cache_key = if controller.respond_to?(:request) - [controller.request.protocol, + [self.class.name,controller.request.protocol, ActionController::Base.asset_host, ActionController::Base.relative_url_root, source, include_host] else - [ActionController::Base.asset_host, source, include_host] + [self.class.name,ActionController::Base.asset_host, source, include_host] end end actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -648,4 +648,10 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase ensure ActionController::Base.asset_host = nil end + + def test_assert_css_and_js_of_the_same_name_return_correct_extension + assert_dom_equal(%(/collaboration/hieraki/javascripts/foo.js), javascript_path("foo")) + assert_dom_equal(%(/collaboration/hieraki/stylesheets/foo.css), stylesheet_path("foo")) + + end end actionpack/test/template/asset_tag_helper_test.rb d7f4921a9a852da7c1075275eaf73822edb7acff Aaron Batalion aaronbatalion aaron@hungrymachine.com http://github.com/rails/rails/commit/e54c33bfc8eab7ac482d571ab6bb0285b40fa56b e54c33bfc8eab7ac482d571ab6bb0285b40fa56b 2008-11-19T15:56:38-08:00 2008-11-19T15:10:02-08:00 need to make sure the asset type is cached with it in Cache.. name is sufficient, not self Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> 0793e10640b72409f04718917efc66012415b669 Jeremy Kemper jeremy jeremy@bitsweat.net