Merge branch 'master' of github.com:lifo/docrails

4 files changed, 58 insertions, 3 deletions

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 5252e43c25..fab70c71d6 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -165,7 +165,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
         match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
         match ':controller/:action'
       end
-      set.install_helpers
+      set.install_helpers([ActionController::Base, ActionView::Base])
 
       process :redirect_to_named_route
       assert_redirected_to 'http://test.host/route_one'
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 1a17e24914..1532bd5c98 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -111,4 +111,4 @@ module RenderStreaming
       assert_equal cache, headers["Cache-Control"]
     end
   end
-end if defined?(Fiber)
+end
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index a37e3a8d6a..17469f8c3e 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -53,6 +53,13 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_multiple_calls_and_flush
+    assert ! content_for?(:title)
+    content_for :title, 'foo'
+    content_for :title, 'bar', true
+    assert_equal 'bar', content_for(:title)
+  end
+
   def test_content_for_with_block
     assert ! content_for?(:title)
     content_for :title do
@@ -63,6 +70,39 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_block_and_multiple_calls_with_flush
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, true do
+      'bar'
+    end
+    assert_equal 'bar', content_for(:title)
+  end
+
+  def test_content_for_with_block_and_multiple_calls_with_flush_nil_content
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, nil, true do
+      'bar'
+    end
+    assert_equal 'bar', content_for(:title)
+  end
+
+  def test_content_for_with_block_and_multiple_calls_without_flush
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, false do
+      'bar'
+    end
+    assert_equal 'foobar', content_for(:title)
+  end
+
   def test_content_for_with_whitespace_block
     assert ! content_for?(:title)
     content_for :title, 'foo'
@@ -74,12 +114,27 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_whitespace_block_and_flush
+    assert ! content_for?(:title)
+    content_for :title, 'foo'
+    content_for :title, true do
+      output_buffer << "  \n  "
+      nil
+    end
+    content_for :title, 'bar', true
+    assert_equal 'bar', content_for(:title)
+  end
+
   def test_content_for_returns_nil_when_writing
     assert ! content_for?(:title)
     assert_equal nil, content_for(:title, 'foo')
     assert_equal nil, content_for(:title) { output_buffer << 'bar'; nil }
     assert_equal nil, content_for(:title) { output_buffer << "  \n  "; nil }
     assert_equal 'foobar', content_for(:title)
+    assert_equal nil, content_for(:title, 'foo', true)
+    assert_equal nil, content_for(:title, true) { output_buffer << 'bar'; nil }
+    assert_equal nil, content_for(:title, true) { output_buffer << "  \n  "; nil }
+    assert_equal 'bar', content_for(:title)
   end
 
   def test_content_for_question_mark
diff --git a/actionpack/test/template/streaming_render_test.rb b/actionpack/test/template/streaming_render_test.rb
index 4d01352b43..520bf3a824 100644
--- a/actionpack/test/template/streaming_render_test.rb
+++ b/actionpack/test/template/streaming_render_test.rb
@@ -106,4 +106,4 @@ class FiberedTest < ActiveSupport::TestCase
       buffered_render(:template => "test/nested_streaming", :layout => "layouts/streaming")
   end
 
-end if defined?(Fiber)
+end