aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAlexey Vakhov <vakhov@gmail.com>2012-04-11 12:45:28 +0600
committerAlexey Vakhov <vakhov@gmail.com>2012-05-04 23:31:09 +0400
commit0d19a081ee12b46791d8709e5c0898429e2ef91f (patch)
tree26ab14ac12a5516c8663bec767d5f6a93ce95ea2 /actionpack/test
parent4bd05a7bdc5003c9ebb090dcb0dc4949e4fb8ad3 (diff)
downloadrails-0d19a081ee12b46791d8709e5c0898429e2ef91f.tar.gz
rails-0d19a081ee12b46791d8709e5c0898429e2ef91f.tar.bz2
rails-0d19a081ee12b46791d8709e5c0898429e2ef91f.zip
Improve assert_template layout checking
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index bc6630a02d..9b0d4d0f4c 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -500,6 +500,21 @@ class AssertTemplateTest < ActionController::TestCase
assert_template :layout => nil
end
+ def test_passed_with_no_layout_false
+ get :hello_world
+ assert_template :layout => false
+ end
+
+ def test_passes_with_correct_layout_without_layouts_prefix
+ get :render_with_layout
+ assert_template :layout => "standard"
+ end
+
+ def test_passes_with_correct_layout_symbol
+ get :render_with_layout
+ assert_template :layout => :standard
+ end
+
def test_assert_template_reset_between_requests
get :hello_world
assert_template 'test/hello_world'