0
@@ -538,12 +538,12 @@ module ActionView
0
             @source = source
0
             @include_host = include_host
0
             @cache_key = if controller.respond_to?(:request)
0
-              [controller.request.protocol,
0
+              [self.class.name,controller.request.protocol,
0
                ActionController::Base.asset_host,
0
                ActionController::Base.relative_url_root,
0
                source, include_host]
0
             else
0
-              [ActionController::Base.asset_host, source, include_host]
0
+              [self.class.name,ActionController::Base.asset_host, source, include_host]
0
             end
0
           end
0
           

0
@@ -648,4 +648,10 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
0
   ensure
0
     ActionController::Base.asset_host = nil
0
   end
0
+
0
+  def test_assert_css_and_js_of_the_same_name_return_correct_extension
0
+    assert_dom_equal(%(/collaboration/hieraki/javascripts/foo.js), javascript_path("foo"))
0
+    assert_dom_equal(%(/collaboration/hieraki/stylesheets/foo.css), stylesheet_path("foo"))
0
+
0
+  end
0
 end