From c5a877f1421744096ce6ffbfce3fc1034bda880e Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Tue, 16 Mar 2010 00:22:22 +0100 Subject: adds test coverage for with_output_buffer Signed-off-by: Jeremy Kemper --- actionpack/test/template/capture_helper_test.rb | 48 +++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) (limited to 'actionpack/test/template/capture_helper_test.rb') diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb index f887c9ab5b..e65f8b15ed 100644 --- a/actionpack/test/template/capture_helper_test.rb +++ b/actionpack/test/template/capture_helper_test.rb @@ -3,6 +3,7 @@ require 'abstract_unit' class CaptureHelperTest < ActionView::TestCase def setup super + @av = ActionView::Base.new @_content_for = Hash.new {|h,k| h[k] = "" } end @@ -13,9 +14,50 @@ class CaptureHelperTest < ActionView::TestCase assert ! content_for?(:something_else) end + def test_with_output_buffer_swaps_the_output_buffer_given_no_argument + assert_nil @av.output_buffer + buffer = @av.with_output_buffer do + @av.output_buffer << '.' + end + assert_equal '.', buffer + assert_nil @av.output_buffer + end + + def test_with_output_buffer_swaps_the_output_buffer_with_an_argument + assert_nil @av.output_buffer + buffer = ActionView::OutputBuffer.new('.') + @av.with_output_buffer(buffer) do + @av.output_buffer << '.' + end + assert_equal '..', buffer + assert_nil @av.output_buffer + end + + def test_with_output_buffer_restores_the_output_buffer + buffer = ActionView::OutputBuffer.new + @av.output_buffer = buffer + @av.with_output_buffer do + @av.output_buffer << '.' + end + assert buffer.equal?(@av.output_buffer) + end + + unless RUBY_VERSION < '1.9' + def test_with_output_buffer_sets_proper_encoding + @av.output_buffer = ActionView::OutputBuffer.new + + # Ensure we set the output buffer to an encoding different than the default one. + alt_encoding = @av.output_buffer.encoding == Encoding::US_ASCII ? Encoding::UTF_8 : Encoding::US_ASCII + @av.output_buffer.force_encoding(alt_encoding) + + @av.with_output_buffer do + assert alt_encoding, @av.output_buffer.encoding + end + end + end + def test_with_output_buffer_does_not_assume_there_is_an_output_buffer - av = ActionView::Base.new - assert_nil av.output_buffer - assert_equal "", av.with_output_buffer {} + assert_nil @av.output_buffer + assert_equal "", @av.with_output_buffer {} end end -- cgit v1.2.3 From 986cac73e3c56b3dfa22fd1464f6913e38d32cc3 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Tue, 16 Mar 2010 20:33:38 +0100 Subject: adds tests for #capture Signed-off-by: Jeremy Kemper --- actionpack/test/template/capture_helper_test.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'actionpack/test/template/capture_helper_test.rb') diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb index e65f8b15ed..c1e83fc04d 100644 --- a/actionpack/test/template/capture_helper_test.rb +++ b/actionpack/test/template/capture_helper_test.rb @@ -7,6 +7,29 @@ class CaptureHelperTest < ActionView::TestCase @_content_for = Hash.new {|h,k| h[k] = "" } end + def test_capture_captures_the_temporary_output_buffer_in_its_block + assert_nil @av.output_buffer + string = @av.capture do + @av.output_buffer << 'foo' + @av.output_buffer << 'bar' + end + assert_nil @av.output_buffer + assert_equal 'foobar', string + assert_kind_of ActionView::NonConcattingString, string + end + + def test_capture_captures_the_value_returned_by_the_block_in_the_temporary_buffer_is_blank + string = @av.capture('foo', 'bar') do |a, b| + a + b + end + assert_equal 'foobar', string + assert_kind_of ActionView::NonConcattingString, string + end + + def test_capture_returns_nil_if_the_returned_value_is_not_a_string + assert_nil @av.capture { 1 } + end + def test_content_for assert ! content_for?(:title) content_for :title, 'title' -- cgit v1.2.3 From 9659d18c9b76f6383854af0cd3a75abb6b1784ea Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Tue, 16 Mar 2010 21:05:01 +0100 Subject: adds tests for #flush_output_buffer [#4196 state:committed] Signed-off-by: Jeremy Kemper --- actionpack/test/template/capture_helper_test.rb | 39 +++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) (limited to 'actionpack/test/template/capture_helper_test.rb') diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb index c1e83fc04d..2216e6b578 100644 --- a/actionpack/test/template/capture_helper_test.rb +++ b/actionpack/test/template/capture_helper_test.rb @@ -18,7 +18,7 @@ class CaptureHelperTest < ActionView::TestCase assert_kind_of ActionView::NonConcattingString, string end - def test_capture_captures_the_value_returned_by_the_block_in_the_temporary_buffer_is_blank + def test_capture_captures_the_value_returned_by_the_block_if_the_temporary_buffer_is_blank string = @av.capture('foo', 'bar') do |a, b| a + b end @@ -70,7 +70,7 @@ class CaptureHelperTest < ActionView::TestCase @av.output_buffer = ActionView::OutputBuffer.new # Ensure we set the output buffer to an encoding different than the default one. - alt_encoding = @av.output_buffer.encoding == Encoding::US_ASCII ? Encoding::UTF_8 : Encoding::US_ASCII + alt_encoding = alt_encoding(@av.output_buffer) @av.output_buffer.force_encoding(alt_encoding) @av.with_output_buffer do @@ -83,4 +83,39 @@ class CaptureHelperTest < ActionView::TestCase assert_nil @av.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 + + unless RUBY_VERSION < '1.9' + 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 + end + + def alt_encoding(output_buffer) + output_buffer.encoding == Encoding::US_ASCII ? Encoding::UTF_8 : Encoding::US_ASCII + end + + def view_with_controller + returning(ActionView::Base.for_controller(TestController.new)) do |view| + view.output_buffer = ActionView::OutputBuffer.new + end + end end -- cgit v1.2.3 From 71c9337f45f9c5461cbc6ddf6cab764ad0f82c3b Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Thu, 18 Mar 2010 15:52:43 -0700 Subject: All tests pass without memoizing view_context --- actionpack/test/template/capture_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/test/template/capture_helper_test.rb') diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb index 2216e6b578..bf541c17d3 100644 --- a/actionpack/test/template/capture_helper_test.rb +++ b/actionpack/test/template/capture_helper_test.rb @@ -114,7 +114,7 @@ class CaptureHelperTest < ActionView::TestCase end def view_with_controller - returning(ActionView::Base.for_controller(TestController.new)) do |view| + returning(TestController.new.view_context) do |view| view.output_buffer = ActionView::OutputBuffer.new end end -- cgit v1.2.3