2 files changed, 49 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/response_body_is_proc_test.rb b/actionpack/test/dispatch/response_body_is_proc_test.rb
new file mode 100644
index 0000000000..fd94832624
--- /dev/null
+++ b/actionpack/test/dispatch/response_body_is_proc_test.rb
@@ -0,0 +1,37 @@
+require 'abstract_unit'
+
+class ResponseBodyIsProcTest < ActionDispatch::IntegrationTest
+  class TestController < ActionController::Base
+    def test
+      self.response_body = proc { |response, output|
+        output.write 'Hello'
+      }
+    end
+  end
+
+  def test_simple_get
+    with_test_route_set do
+      assert_deprecated do
+        get '/test'
+      end
+      assert_response :success
+      assert_equal 'Hello', response.body
+    end
+  end
+
+  private
+
+    def with_test_route_set(options = {})
+      with_routing do |set|
+        set.draw do
+          match ':action', :to => ::ResponseBodyIsProcTest::TestController
+        end
+
+        @app = self.class.build_app(set) do |middleware|
+          middleware.delete "ActionDispatch::ShowExceptions"
+        end
+
+        yield
+      end
+    end
+end
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index 592c7da060..a9157e711c 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -38,7 +38,15 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal '&lt;em&gt;bar&lt;/em&gt;', string
   end
 
-  def test_content_for
+  def test_capture_used_for_read
+    content_for :foo, "foo"
+    assert_equal "foo", content_for(:foo)
+
+    content_for(:bar){ "bar" }
+    assert_equal "bar", content_for(:bar)
+  end
+
+  def test_content_for_question_mark
     assert ! content_for?(:title)
     content_for :title, 'title'
     assert content_for?(:title)
@@ -49,14 +57,14 @@ class CaptureHelperTest < ActionView::TestCase
     assert !content_for?(:title)
     provide :title, "hi"
     assert content_for?(:title)
-    assert_equal "hi", @view_flow.get(:title)
+    assert_equal "hi", content_for(:title)
     provide :title, "<p>title</p>"
-    assert_equal "hi&lt;p&gt;title&lt;/p&gt;", @view_flow.get(:title)
+    assert_equal "hi&lt;p&gt;title&lt;/p&gt;", content_for(:title)
 
     @view_flow = ActionView::OutputFlow.new
     provide :title, "hi"
     provide :title, "<p>title</p>".html_safe
-    assert_equal "hi<p>title</p>", @view_flow.get(:title)
+    assert_equal "hi<p>title</p>", content_for(:title)
   end
 
   def test_with_output_buffer_swaps_the_output_buffer_given_no_argument