4 files changed, 140 insertions, 3 deletions
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index b550d3db78..89bf4fdacc 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -258,7 +258,7 @@ class RackResponseTest < BaseRackTest
     }, headers)
 
     parts = []
-    body.each { |part| parts << part }
+    body.each { |part| parts << part.to_s }
     assert_equal ["0", "1", "2", "3", "4"], parts
   end
 end
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index a27e951929..3d1904fee9 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -44,12 +44,12 @@ class SendFileTest < ActionController::TestCase
     response = nil
     assert_nothing_raised { response = process('file') }
     assert_not_nil response
-    assert_kind_of Proc, response.body
+    assert_kind_of Proc, response.body_parts
 
     require 'stringio'
     output = StringIO.new
     output.binmode
-    assert_nothing_raised { response.body.call(response, output) }
+    assert_nothing_raised { response.body_parts.call(response, output) }
     assert_equal file_data, output.string
   end
 
diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
new file mode 100644
index 0000000000..209f6ec1ff
--- /dev/null
+++ b/actionpack/test/template/body_parts_test.rb
@@ -0,0 +1,102 @@
+require 'abstract_unit'
+require 'action_view/body_parts/concurrent_block'
+
+class BodyPartsTest < ActionController::TestCase
+  RENDERINGS = [Object.new, Object.new, Object.new]
+
+  class TestController < ActionController::Base
+    def index
+      RENDERINGS.each do |rendering|
+        response.template.punctuate_body! rendering
+      end
+      @performed_render = true
+    end
+  end
+
+  tests TestController
+
+  def test_body_parts
+    get :index
+    assert_equal RENDERINGS, @response.body_parts
+    assert_equal RENDERINGS.join, @response.body
+  end
+end
+
+class ConcurrentBlockPartTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      append_thread_id = lambda do |parts|
+        parts << Thread.current.object_id
+        parts << '::'
+        parts << Time.now.to_i
+        sleep 0.1
+      end
+
+      future_render &append_thread_id
+      response.body_parts << '-'
+
+      future_render &append_thread_id
+      response.body_parts << '-'
+
+      future_render do |parts|
+        parts << ActionView::BodyParts::ConcurrentBlock.new(&append_thread_id)
+        parts << '-'
+        parts << ActionView::BodyParts::ConcurrentBlock.new(&append_thread_id)
+      end
+
+      @performed_render = true
+    end
+
+    def future_render(&block)
+      response.template.punctuate_body! ActionView::BodyParts::ConcurrentBlock.new(&block)
+    end
+  end
+
+  tests TestController
+
+  def test_concurrent_threaded_parts
+    get :index
+
+    elapsed = Benchmark.ms do
+      thread_ids = @response.body.split('-').map { |part| part.split('::').first.to_i }
+      assert_equal thread_ids.size, thread_ids.uniq.size
+    end
+    assert (elapsed - 100).abs < 10, elapsed
+  end
+end
+
+
+class OpenUriPartTest < ActionController::TestCase
+  class OpenUriPart < ActionView::BodyParts::ConcurrentBlock
+    def initialize(url)
+      url = URI::Generic === url ? url : URI.parse(url)
+      super() { |body| body << url.read }
+    end
+  end
+
+  class TestController < ActionController::Base
+    def index
+      render_url 'http://localhost/foo'
+      render_url 'http://localhost/bar'
+      render_url 'http://localhost/baz'
+      @performed_render = true
+    end
+
+    def render_url(url)
+      url = URI.parse(url)
+      def url.read; sleep 0.1; path end
+      response.template.punctuate_body! OpenUriPart.new(url)
+    end
+  end
+
+  tests TestController
+
+  def test_concurrent_open_uri_parts
+    get :index
+
+    elapsed = Benchmark.ms do
+      assert_equal '/foo/bar/baz', @response.body
+    end
+    assert (elapsed - 100).abs < 10, elapsed
+  end
+end
diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
new file mode 100644
index 0000000000..6d8eab63dc
--- /dev/null
+++ b/actionpack/test/template/output_buffer_test.rb
@@ -0,0 +1,35 @@
+require 'abstract_unit'
+
+class OutputBufferTest < ActionController::TestCase
+  class TestController < ActionController::Base
+    def index
+      render :text => 'foo'
+    end
+  end
+
+  tests TestController
+
+  def test_flush_output_buffer
+    # Start with the default body parts
+    get :index
+    assert_equal ['foo'], @response.body_parts
+    assert_nil @response.template.output_buffer
+
+    # Nil output buffer is skipped
+    @response.template.flush_output_buffer
+    assert_nil @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Empty output buffer is skipped
+    @response.template.output_buffer = ''
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo'], @response.body_parts
+
+    # Flushing appends the output buffer to the body parts
+    @response.template.output_buffer = 'bar'
+    @response.template.flush_output_buffer
+    assert_equal '', @response.template.output_buffer
+    assert_equal ['foo', 'bar'], @response.body_parts
+  end
+end