diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-26 19:47:50 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-26 19:47:50 +0000 |
| commit | 3d1b51b4411ffe8de92d997b824637f9eaf47bb1 (patch) | |
| tree | 2bdc1efce7f43615960f4b2ba2f2277c7395cd3d /actionpack/test | |
| parent | 26eaf073c4de8276663f927fdeeb91453e8b3956 (diff) | |
| download | rails-3d1b51b4411ffe8de92d997b824637f9eaf47bb1.tar.gz rails-3d1b51b4411ffe8de92d997b824637f9eaf47bb1.tar.bz2 rails-3d1b51b4411ffe8de92d997b824637f9eaf47bb1.zip | |
Added .rxml (and any non-rhtml template, really) supportfor CaptureHelper#content_for and CaptureHelper#capture #3287 [Brian Takita]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
4 files changed, 41 insertions, 1 deletions
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb index 461777e4e2..e4f76a4dbf 100644 --- a/actionpack/test/controller/capture_test.rb +++ b/actionpack/test/controller/capture_test.rb @@ -7,6 +7,18 @@ class CaptureController < ActionController::Base def content_for render :layout => "talk_from_action" end + + def erb_content_for + render :layout => "talk_from_action" + end + + def block_content_for + render :layout => "talk_from_action" + end + + def non_erb_block_content_for + render :layout => "talk_from_action" + end def rescue_action(e) raise end end @@ -34,7 +46,22 @@ class CaptureTest < Test::Unit::TestCase def test_content_for get :content_for - assert_equal "<title>Putting stuff in the title!</title>\n\nGreat stuff!", @response.body + assert_equal expected_content_for_output, @response.body + end + + def test_erb_content_for + get :content_for + assert_equal expected_content_for_output, @response.body + end + + def test_block_content_for + get :block_content_for + assert_equal expected_content_for_output, @response.body + end + + def test_non_erb_block_content_for + get :non_erb_block_content_for + assert_equal expected_content_for_output, @response.body end def test_update_element_with_capture @@ -45,4 +72,9 @@ class CaptureTest < Test::Unit::TestCase @response.body.strip ) end + + private + def expected_content_for_output + "<title>Putting stuff in the title!</title>\n\nGreat stuff!" + end end diff --git a/actionpack/test/fixtures/test/block_content_for.rhtml b/actionpack/test/fixtures/test/block_content_for.rhtml new file mode 100644 index 0000000000..9510337365 --- /dev/null +++ b/actionpack/test/fixtures/test/block_content_for.rhtml @@ -0,0 +1,2 @@ +<% block_content_for :title do 'Putting stuff in the title!' end %> +Great stuff!
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/erb_content_for.rhtml b/actionpack/test/fixtures/test/erb_content_for.rhtml new file mode 100644 index 0000000000..c3bdd13643 --- /dev/null +++ b/actionpack/test/fixtures/test/erb_content_for.rhtml @@ -0,0 +1,2 @@ +<% erb_content_for :title do %>Putting stuff in the title!<% end %> +Great stuff!
\ No newline at end of file diff --git a/actionpack/test/fixtures/test/non_erb_block_content_for.rxml b/actionpack/test/fixtures/test/non_erb_block_content_for.rxml new file mode 100644 index 0000000000..6ff6db0f95 --- /dev/null +++ b/actionpack/test/fixtures/test/non_erb_block_content_for.rxml @@ -0,0 +1,4 @@ +content_for :title do + 'Putting stuff in the title!' +end +xml << "\nGreat stuff!"
\ No newline at end of file |