diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 16:50:26 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 16:55:27 -0700 |
| commit | 28dbeb3a643eeb35767df55ed579f54438c3ee18 (patch) | |
| tree | 67d8e6dfa2d4fc7a7811175a3250ef8ff5bd8bba /actionpack/test/controller | |
| parent | 63ed43cb9901cc7adc352a51fa256c3ba7b6637f (diff) | |
| download | rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.tar.gz rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.tar.bz2 rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.zip | |
Get controller/render_other_test.rb to pass on new base and fixed a bug in new base with regards to rendering layouts.
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/render_other_test.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb index 3c52b7036d..05645e47fa 100644 --- a/actionpack/test/controller/render_other_test.rb +++ b/actionpack/test/controller/render_other_test.rb @@ -4,6 +4,7 @@ require 'pathname' class TestController < ActionController::Base protect_from_forgery + layout :determine_layout module RenderTestHelper def rjs_helper_method_from_module @@ -113,9 +114,16 @@ private def determine_layout case action_name - when "render_js_with_explicit_template", - "render_js_with_explicit_action_template", - "delete_with_js", "update_page", "update_page_with_instance_variables" + when "hello_world", "layout_test", "rendering_without_layout", + "rendering_nothing_on_layout", "render_text_hello_world", + "render_text_hello_world_with_layout", + "hello_world_with_layout_false", + "partial_only", "partial_only_with_layout", + "accessing_params_in_template", + "accessing_params_in_template_with_layout", + "render_with_explicit_template", + "render_with_explicit_string_template", + "update_page", "update_page_with_instance_variables" "layouts/standard" when "action_talk_to_layout", "layout_overriding_layout" |