Merge commit 'mainstream/master'

Conflicts:
	railties/guides/images/fxn.jpg
	railties/guides/rails_guides/generator.rb

2 files changed, 57 insertions, 0 deletions

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
new file mode 100644
index 0000000000..4c82b75cdc
--- /dev/null
+++ b/actionpack/test/template/body_parts_test.rb
@@ -0,0 +1,22 @@
+require 'abstract_unit'
+
+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
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