Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
dd0275e4
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dd0275e4
编写于
12月 20, 2011
作者:
J
José Valim
提交者:
Alexey Vakhov
3月 28, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add a test case for layout nil.
上级
c82fd8fc
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
16 addition
and
1 deletion
+16
-1
actionpack/lib/abstract_controller/layouts.rb
actionpack/lib/abstract_controller/layouts.rb
+1
-0
actionpack/test/abstract/layouts_test.rb
actionpack/test/abstract/layouts_test.rb
+15
-1
未找到文件。
actionpack/lib/abstract_controller/layouts.rb
浏览文件 @
dd0275e4
...
@@ -249,6 +249,7 @@ def conditional_layout?
...
@@ -249,6 +249,7 @@ def conditional_layout?
# Symbol:: call the method specified by the symbol, which will return the template name
# Symbol:: call the method specified by the symbol, which will return the template name
# false:: There is no layout
# false:: There is no layout
# true:: raise an ArgumentError
# true:: raise an ArgumentError
# nil:: Force default layout behavior with inheritance
#
#
# ==== Parameters
# ==== Parameters
# * <tt>layout</tt> - The layout to use.
# * <tt>layout</tt> - The layout to use.
...
...
actionpack/test/abstract/layouts_test.rb
浏览文件 @
dd0275e4
...
@@ -14,7 +14,10 @@ class Base < AbstractController::Base
...
@@ -14,7 +14,10 @@ class Base < AbstractController::Base
"layouts/overwrite.erb"
=>
"Overwrite <%= yield %>"
,
"layouts/overwrite.erb"
=>
"Overwrite <%= yield %>"
,
"layouts/with_false_layout.erb"
=>
"False Layout <%= yield %>"
,
"layouts/with_false_layout.erb"
=>
"False Layout <%= yield %>"
,
"abstract_controller_tests/layouts/with_string_implied_child.erb"
=>
"abstract_controller_tests/layouts/with_string_implied_child.erb"
=>
"With Implied <%= yield %>"
"With Implied <%= yield %>"
,
"abstract_controller_tests/layouts/with_grand_child_of_implied.erb"
=>
"With Grand Child <%= yield %>"
)]
)]
end
end
...
@@ -64,6 +67,10 @@ class WithStringImpliedChild < WithString
...
@@ -64,6 +67,10 @@ class WithStringImpliedChild < WithString
class
WithChildOfImplied
<
WithStringImpliedChild
class
WithChildOfImplied
<
WithStringImpliedChild
end
end
class
WithGrandChildOfImplied
<
WithStringImpliedChild
layout
nil
end
class
WithProc
<
Base
class
WithProc
<
Base
layout
proc
{
|
c
|
"overwrite"
}
layout
proc
{
|
c
|
"overwrite"
}
...
@@ -299,6 +306,13 @@ class TestBase < ActiveSupport::TestCase
...
@@ -299,6 +306,13 @@ class TestBase < ActiveSupport::TestCase
assert_equal
"With Implied Hello string!"
,
controller
.
response_body
assert_equal
"With Implied Hello string!"
,
controller
.
response_body
end
end
test
"when a grandchild has nil layout specified, the child has an implied layout, and the "
\
"parent has specified a layout, use the child controller layout"
do
controller
=
WithGrandChildOfImplied
.
new
controller
.
process
(
:index
)
assert_equal
"With Grand Child Hello string!"
,
controller
.
response_body
end
test
"raises an exception when specifying layout true"
do
test
"raises an exception when specifying layout true"
do
assert_raises
ArgumentError
do
assert_raises
ArgumentError
do
Object
.
class_eval
do
Object
.
class_eval
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录