with_output_buffer returns the temporary buffer instead of the result…

… of the block
rails · Jun 9, 2008 · c88f2b5 · c88f2b5 · denis · Jun 10, 2008
1 parent df44df9
commit c88f2b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -123,6 +123,7 @@ def content_for(name, content = nil, &block)
         def with_output_buffer(buf = '')
           self.output_buffer, old_buffer = buf, output_buffer
           yield
+          output_buffer
         ensure
           self.output_buffer = old_buffer
         end

diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
@@ -45,6 +45,7 @@ def test_content_tag_with_block_and_options
   end
 
   def test_content_tag_with_block_and_options_outside_of_action_view
+    self.output_buffer = nil
     assert_equal content_tag("a", "Create", :href => "create"),
                  content_tag("a", "href" => "create") { "Create" }    
   end