diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-10-08 15:05:18 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-10-08 15:05:18 -0300 |
| commit | 0cf4662ec589813c4fdc22de3398730cab05c5ed (patch) | |
| tree | d422b8d8e4ccccf9bd89443b82398e1d7313269f /actionpack/test/template/render_test.rb | |
| parent | c3f9d51a00b9e7e5f5d14e7464fae04c48198756 (diff) | |
| parent | 665c7ad29d5614b8f5535d317f1dd2803ddcaa7d (diff) | |
| download | rails-0cf4662ec589813c4fdc22de3398730cab05c5ed.tar.gz rails-0cf4662ec589813c4fdc22de3398730cab05c5ed.tar.bz2 rails-0cf4662ec589813c4fdc22de3398730cab05c5ed.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/template/render_test.rb')
| -rw-r--r-- | actionpack/test/template/render_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb index 3c192906ae..35c51ca7ea 100644 --- a/actionpack/test/template/render_test.rb +++ b/actionpack/test/template/render_test.rb @@ -229,7 +229,7 @@ module RenderTestCases end def test_render_with_nested_layout - assert_equal %(<title>title</title>\n<div id="column">column</div>\n<div id="content">content</div>\n), + assert_equal %(<title>title</title>\n\n\n<div id="column">column</div>\n<div id="content">content</div>\n), @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield") end |