From 62668cccb9a288b0cd6f6dd49df71661164be2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 16 Apr 2011 10:31:55 +0200
Subject: The magic medicine worked.

---
 actionpack/lib/action_view/base.rb                |  2 +-
 actionpack/test/template/fibered_render_test.rb   | 27 -------------------
 actionpack/test/template/streaming_render_test.rb | 33 +++++++++++++++++++++++
 3 files changed, 34 insertions(+), 28 deletions(-)
 delete mode 100644 actionpack/test/template/fibered_render_test.rb
 create mode 100644 actionpack/test/template/streaming_render_test.rb

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 513080ae54..9e8a3c51a3 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -153,7 +153,7 @@ module ActionView #:nodoc:
       end
     end
 
-    attr_accessor :_template, :_view_flow, :magic_medicine
+    attr_accessor :_template, :_view_flow
     attr_internal :request, :controller, :config, :assigns, :lookup_context
 
     delegate :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, :to => :lookup_context
diff --git a/actionpack/test/template/fibered_render_test.rb b/actionpack/test/template/fibered_render_test.rb
deleted file mode 100644
index f62af10812..0000000000
--- a/actionpack/test/template/fibered_render_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# encoding: utf-8
-require 'abstract_unit'
-require 'controller/fake_models'
-
-class TestController < ActionController::Base
-end
-
-
-class FiberedTest < ActiveSupport::TestCase
-
-  def setup
-    view_paths = ActionController::Base.view_paths
-    @assigns = { :secret => 'in the sauce' }
-    @view = ActionView::Base.new(view_paths, @assigns)
-    @view.magic_medicine = true
-    @controller_view = TestController.new.view_context
-  end
-
-  def test_render_template
-    assert_equal "Hello world!", @view.render(:template => "test/hello_world")
-  end
-
-  def test_render_with_layout
-    assert_equal %(<title></title>\nHello world!\n),
-      @view.render(:template => "test/hello_world.erb", :layout => "layouts/yield")
-  end
-end if defined?(Fiber)
\ No newline at end of file
diff --git a/actionpack/test/template/streaming_render_test.rb b/actionpack/test/template/streaming_render_test.rb
new file mode 100644
index 0000000000..d6624149d4
--- /dev/null
+++ b/actionpack/test/template/streaming_render_test.rb
@@ -0,0 +1,33 @@
+# encoding: utf-8
+require 'abstract_unit'
+require 'controller/fake_models'
+
+class TestController < ActionController::Base
+end
+
+class FiberedTest < ActiveSupport::TestCase
+  def setup
+    view_paths = ActionController::Base.view_paths
+    @assigns = { :secret => 'in the sauce' }
+    @view = ActionView::Base.new(view_paths, @assigns)
+    @controller_view = TestController.new.view_context
+  end
+
+  def buffered_render(options)
+    body = @view.render_body(options)
+    string = ""
+    body.each do |piece|
+      string << piece
+    end
+    string
+  end
+
+  def test_render_template_without_layout
+    assert_equal "Hello world!", buffered_render(:template => "test/hello_world")
+  end
+
+  def test_render_template_with_layout
+    assert_equal %(<title></title>\nHello world!\n),
+      buffered_render(:template => "test/hello_world.erb", :layout => "layouts/yield")
+  end
+end if defined?(Fiber)
\ No newline at end of file
-- 
cgit v1.2.3