2 files changed, 4 insertions, 20 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index c6d61bb504..aee60b1c6f 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -436,6 +436,8 @@ class FragmentCachingTest < Test::Unit::TestCase
     @controller.request = @request
     @controller.response = @response
     @controller.send(:initialize_current_url)
+    @controller.send(:initialize_template_class, @response)
+    @controller.send(:assign_shortcuts, @request, @response)
   end
 
   def test_fragment_cache_key
@@ -525,7 +527,7 @@ class FragmentCachingTest < Test::Unit::TestCase
 
   def test_cache_erb_fragment
     @store.write('views/expensive', 'fragment content')
-    _erbout = 'generated till now -> '
+    @controller.response.template.output_buffer = 'generated till now -> '
 
     assert_equal( 'generated till now -> fragment content',
                   ActionView::TemplateHandlers::ERB.new(@controller).cache_fragment(Proc.new{ }, 'expensive'))
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index aaafea3920..2604844b84 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -11,16 +11,8 @@ class CaptureController < ActionController::Base
   def content_for_with_parameter
     render :layout => "talk_from_action"
   end
-  
-  def content_for_concatenated
-    render :layout => "talk_from_action"
-  end
 
-  def erb_content_for
-    render :layout => "talk_from_action"
-  end
-
-  def block_content_for
+  def content_for_concatenated
     render :layout => "talk_from_action"
   end
 
@@ -62,21 +54,11 @@ class CaptureTest < Test::Unit::TestCase
     assert_equal expected_content_for_output, @response.body
   end
 
-  def test_erb_content_for
-    get :erb_content_for
-    assert_equal expected_content_for_output, @response.body
-  end
-
   def test_should_set_content_for_with_parameter
     get :content_for_with_parameter
     assert_equal expected_content_for_output, @response.body
   end
 
-  def test_block_content_for
-    get :block_content_for
-    assert_equal expected_content_for_output, @response.body
-  end
-
   def test_non_erb_block_content_for
     get :non_erb_block_content_for
     assert_equal expected_content_for_output, @response.body