Skip to content

Commit

Permalink
Merge pull request #15513 from zenspider/remove_flush_output_buffer
Browse files Browse the repository at this point in the history
Removed CaptureHelper#flush_output_buffer as it is only used in tests.
  • Loading branch information
tenderlove committed Jun 5, 2014
2 parents 7ea384b + 479c7ca commit 805c31d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 91 deletions.
9 changes: 0 additions & 9 deletions actionview/lib/action_view/helpers/capture_helper.rb
Expand Up @@ -202,15 +202,6 @@ def with_output_buffer(buf = nil) #:nodoc:
ensure
self.output_buffer = old_buffer
end

# Add the output buffer to the response body and start a new one.
def flush_output_buffer #:nodoc:
if output_buffer && !output_buffer.empty?
response.stream.write output_buffer
self.output_buffer = output_buffer.respond_to?(:clone_empty) ? output_buffer.clone_empty : output_buffer[0, 0]
nil
end
end
end
end
end
23 changes: 0 additions & 23 deletions actionview/test/template/capture_helper_test.rb
Expand Up @@ -207,29 +207,6 @@ def test_with_output_buffer_does_not_assume_there_is_an_output_buffer
assert_equal "", @av.with_output_buffer {}
end

def test_flush_output_buffer_concats_output_buffer_to_response
view = view_with_controller
assert_equal [], view.response.body_parts

view.output_buffer << 'OMG'
view.flush_output_buffer
assert_equal ['OMG'], view.response.body_parts
assert_equal '', view.output_buffer

view.output_buffer << 'foobar'
view.flush_output_buffer
assert_equal ['OMG', 'foobar'], view.response.body_parts
assert_equal '', view.output_buffer
end

def test_flush_output_buffer_preserves_the_encoding_of_the_output_buffer
view = view_with_controller
alt_encoding = alt_encoding(view.output_buffer)
view.output_buffer.force_encoding(alt_encoding)
flush_output_buffer
assert_equal alt_encoding, view.output_buffer.encoding
end

def alt_encoding(output_buffer)
output_buffer.encoding == Encoding::US_ASCII ? Encoding::UTF_8 : Encoding::US_ASCII
end
Expand Down
59 changes: 0 additions & 59 deletions actionview/test/template/output_buffer_test.rb

This file was deleted.

0 comments on commit 805c31d

Please sign in to comment.