From 71c9337f45f9c5461cbc6ddf6cab764ad0f82c3b Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Thu, 18 Mar 2010 15:52:43 -0700
Subject: All tests pass without memoizing view_context

---
 actionpack/test/template/capture_helper_test.rb |  2 +-
 actionpack/test/template/output_buffer_test.rb  | 15 ++++++++-------
 actionpack/test/template/render_test.rb         |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'actionpack/test/template')

diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index 2216e6b578..bf541c17d3 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -114,7 +114,7 @@ class CaptureHelperTest < ActionView::TestCase
   end
 
   def view_with_controller
-    returning(ActionView::Base.for_controller(TestController.new)) do |view|
+    returning(TestController.new.view_context) do |view|
       view.output_buffer = ActionView::OutputBuffer.new
     end
   end
diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
index 9016b74489..bd49a11af1 100644
--- a/actionpack/test/template/output_buffer_test.rb
+++ b/actionpack/test/template/output_buffer_test.rb
@@ -10,6 +10,7 @@ class OutputBufferTest < ActionController::TestCase
   tests TestController
 
   def setup
+    @vc = @controller.view_context
     get :index
     assert_equal ['foo'], body_parts
   end
@@ -25,15 +26,15 @@ class OutputBufferTest < ActionController::TestCase
   end
 
   test 'flushing ignores empty output buffer' do
-    @controller.view_context.output_buffer = ''
-    @controller.view_context.flush_output_buffer
+    @vc.output_buffer = ''
+    @vc.flush_output_buffer
     assert_equal '', output_buffer
     assert_equal ['foo'], body_parts
   end
 
   test 'flushing appends the output buffer to the body parts' do
-    @controller.view_context.output_buffer = 'bar'
-    @controller.view_context.flush_output_buffer
+    @vc.output_buffer = 'bar'
+    @vc.flush_output_buffer
     assert_equal '', output_buffer
     assert_equal ['foo', 'bar'], body_parts
   end
@@ -41,8 +42,8 @@ class OutputBufferTest < ActionController::TestCase
   if '1.9'.respond_to?(:force_encoding)
     test 'flushing preserves output buffer encoding' do
       original_buffer = ' '.force_encoding(Encoding::EUC_JP)
-      @controller.view_context.output_buffer = original_buffer
-      @controller.view_context.flush_output_buffer
+      @vc.output_buffer = original_buffer
+      @vc.flush_output_buffer
       assert_equal ['foo', original_buffer], body_parts
       assert_not_equal original_buffer, output_buffer
       assert_equal Encoding::EUC_JP, output_buffer.encoding
@@ -51,7 +52,7 @@ class OutputBufferTest < ActionController::TestCase
 
   protected
     def output_buffer
-      @controller.view_context.output_buffer
+      @vc.output_buffer
     end
 
     def body_parts
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index e66202e8fe..e54ebfbf8d 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -9,7 +9,7 @@ module RenderTestCases
   def setup_view(paths)
     @assigns = { :secret => 'in the sauce' }
     @view = ActionView::Base.new(paths, @assigns)
-    @controller_view = ActionView::Base.for_controller(TestController.new)
+    @controller_view = TestController.new.view_context
 
     # Reload and register danish language for testing
     I18n.reload!
-- 
cgit v1.2.3