aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-09 07:20:55 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-09 07:20:55 +0100
commit5ad52152117ecda1166359c499bcd03ae6be3365 (patch)
treed7086230a80f600077c52bd96d5eb3cad55e8c62 /actionpack/test/abstract
parent2995134cba898c95d62bb9756742959a0839cbf0 (diff)
downloadrails-5ad52152117ecda1166359c499bcd03ae6be3365.tar.gz
rails-5ad52152117ecda1166359c499bcd03ae6be3365.tar.bz2
rails-5ad52152117ecda1166359c499bcd03ae6be3365.zip
Deprecate implicit layout lookup in favor of inheriting the _layout config.
Diffstat (limited to 'actionpack/test/abstract')
-rw-r--r--actionpack/test/abstract/layouts_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index a5382a730d..de6f42d826 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -258,7 +258,7 @@ module AbstractControllerTests
test "when a child controller has an implied layout, use that layout and not the parent controller layout" do
controller = WithStringImpliedChild.new
- controller.process(:index)
+ assert_deprecated { controller.process(:index) }
assert_equal "With Implied Hello string!", controller.response_body
end
@@ -271,7 +271,7 @@ module AbstractControllerTests
test "when a grandchild has no layout specified, the child has an implied layout, and the " \
"parent has specified a layout, use the child controller layout" do
controller = WithChildOfImplied.new
- controller.process(:index)
+ assert_deprecated { controller.process(:index) }
assert_equal "With Implied Hello string!", controller.response_body
end