0
@@ -33,8 +33,13 @@ module ActionController
0
         cache_this_instance = options[:params] && options[:params].delete(:caching) # the rest of the request processing code doesn't have to know about this option
0
         return false unless self.perform_caching
0
     
0
-        if embedded_class(options).cached_embedded["#{embedded_class(options).controller_path}/#{options[:action]}".to_sym]
0
-          return true unless cache_this_instance == false
0
+        controller_class = embedded_class(options)
0
+        while controller_class
0
+          if controller_class.cached_embedded["#{controller_class.controller_path}/#{options[:action]}".to_sym]
0
+            return true unless cache_this_instance == false
0
+          end
0
+          controller_class = controller_class.superclass
0
+          controller_class = nil unless controller_class.respond_to? :controller_path
0
         end
0
 
0
         return cache_this_instance

0
@@ -18,12 +18,15 @@ class TestController < ActionController::Base
0
   end
0
   
0
   def embedded_actions
0
+    render :template => "test/embedded_actions"
0
   end
0
 
0
   def embedded_overrides
0
+    render :template => "test/embedded_overrides"
0
   end
0
 
0
   def forced_refresh
0
+    render :template => "test/forced_refresh"
0
   end
0
   
0
   def dump_params

0
@@ -98,4 +98,24 @@ class CachesEmbeddedTest < Test::Unit::TestCase
0
     get :forced_refresh
0
     assert_equal "regular value is 3\ncached value is 2", @response.body, "Another call without refresh should reflect the cached value"
0
   end
0
+
0
+  def test_caches_embedded_across_inheritance_tree
0
+    @controller = InheritingController.new
0
+
0
+    InheritingController.test_value = "foo"
0
+    get :inline_erb_action, :erb => "<%= embed_action :action => 'cached_action' %>"
0
+    assert_equal "foo", @response.body
0
+
0
+    InheritingController.test_value = "bar"
0
+    get :inline_erb_action, :erb => "<%= embed_action :action => 'cached_action' %>"
0
+    assert_equal "foo", @response.body
0
+
0
+    InheritingController.test_value = "bar"
0
+    @controller.expire_embedded :controller => "inheriting", :action => "cached_action"
0
+    get :inline_erb_action, :erb => "<%= embed_action :action => 'cached_action' %>"
0
+    assert_equal "bar", @response.body
0
+  end
0
+
0
+  
0
 end
0
+