diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-06 20:20:22 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2016-08-06 20:20:22 +0200 |
| commit | b326e82dc012d81e9698cb1f402502af1788c1e9 (patch) | |
| tree | 6b6452129a5b6b684f3d44f21afd2b1bea83fa22 /actionview/test/actionpack/controller | |
| parent | 80e66cc4d90bf8c15d1a5f6e3152e90147f00772 (diff) | |
| download | rails-b326e82dc012d81e9698cb1f402502af1788c1e9.tar.gz rails-b326e82dc012d81e9698cb1f402502af1788c1e9.tar.bz2 rails-b326e82dc012d81e9698cb1f402502af1788c1e9.zip | |
applies remaining conventions across the project
Diffstat (limited to 'actionview/test/actionpack/controller')
| -rw-r--r-- | actionview/test/actionpack/controller/render_test.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionview/test/actionpack/controller/render_test.rb b/actionview/test/actionpack/controller/render_test.rb index 9c13bd7f8e..453c2e75d6 100644 --- a/actionview/test/actionpack/controller/render_test.rb +++ b/actionview/test/actionpack/controller/render_test.rb @@ -642,7 +642,7 @@ class TestController < ApplicationController def determine_layout case action_name - when "hello_world", "layout_test", "rendering_without_layout", + 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", @@ -652,11 +652,11 @@ class TestController < ApplicationController "render_with_explicit_string_template", "update_page", "update_page_with_instance_variables" - "layouts/standard" - when "action_talk_to_layout", "layout_overriding_layout" - "layouts/talk_from_action" - when "render_implicit_html_template_from_xhr_request" - (request.xhr? ? "layouts/xhr" : "layouts/standard") + "layouts/standard" + when "action_talk_to_layout", "layout_overriding_layout" + "layouts/talk_from_action" + when "render_implicit_html_template_from_xhr_request" + (request.xhr? ? "layouts/xhr" : "layouts/standard") end end end |