diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-22 16:18:10 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-01-22 16:18:10 -0600 |
| commit | eb9af20b7cc0e374277cf330bdd404f9daab28ec (patch) | |
| tree | ba05a906690684e442ed92db3e63e295f0dd133e /actionpack/test/controller/render_test.rb | |
| parent | cc0b5fa9930dcc60914e21b518b3c54109243cfa (diff) | |
| download | rails-eb9af20b7cc0e374277cf330bdd404f9daab28ec.tar.gz rails-eb9af20b7cc0e374277cf330bdd404f9daab28ec.tar.bz2 rails-eb9af20b7cc0e374277cf330bdd404f9daab28ec.zip | |
Begin unifying the interface between ActionController and ActionView
Diffstat (limited to 'actionpack/test/controller/render_test.rb')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 8809aa7c34..11b502a564 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -342,7 +342,7 @@ class TestController < ActionController::Base end def accessing_params_in_template_with_layout - render :layout => nil, :inline => "Hello: <%= params[:name] %>" + render :layout => true, :inline => "Hello: <%= params[:name] %>" end def render_with_explicit_template @@ -1612,7 +1612,7 @@ class RenderingLoggingTest < ActionController::TestCase @controller.logger = MockLogger.new get :layout_test logged = @controller.logger.logged.find_all {|l| l =~ /render/i } - assert_equal "Rendering template within layouts/standard", logged[0] - assert_equal "Rendering test/hello_world", logged[1] + assert_equal "Rendering test/hello_world", logged[0] + assert_equal "Rendering template within layouts/standard", logged[1] end end |