All tests pass without memoizing view_context

2 files changed, 13 insertions, 3 deletions

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index f6264c0954..5157454be0 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -616,8 +616,10 @@ class FragmentCachingTest < ActionController::TestCase
     @store.write('views/expensive', 'fragment content')
     fragment_computed = false
 
+    view_context = @controller.view_context
+
     buffer = 'generated till now -> '.html_safe
-    buffer << @controller.fragment_for('expensive') { fragment_computed = true }
+    buffer << view_context.send(:fragment_for, 'expensive') { fragment_computed = true }
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
@@ -627,8 +629,10 @@ class FragmentCachingTest < ActionController::TestCase
     @store.write('views/expensive', 'fragment content')
     fragment_computed = false
 
+    view_context = @controller.view_context
+
     buffer = 'generated till now -> '.html_safe
-    buffer << @controller.fragment_for('expensive') { fragment_computed = true }
+    buffer << view_context.send(:fragment_for, 'expensive') { fragment_computed = true }
 
     assert !fragment_computed
     assert_equal 'generated till now -> fragment content', buffer
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 1d7692f0a8..24817a93d2 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -18,6 +18,13 @@ class TestController < ActionController::Base
 
   layout :determine_layout
 
+  def name
+    nil
+  end
+
+  private :name
+  helper_method :name
+
   def hello_world
   end
 
@@ -418,7 +425,6 @@ class TestController < ActionController::Base
 
   def rendering_with_conflicting_local_vars
     @name = "David"
-    def view_context.name() nil end
     render :action => "potential_conflicts"
   end