Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9c91c168
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,发现更多精彩内容 >>
提交
9c91c168
编写于
8月 14, 2014
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16027 from tgxworld/template_assertions
Fixes to ActionController::TemplateAssertions
上级
43ce6e22
b1ba333e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
0 deletion
+36
-0
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+4
-0
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_controller/test_case.rb
+9
-0
actionpack/test/controller/action_pack_assertions_test.rb
actionpack/test/controller/action_pack_assertions_test.rb
+23
-0
未找到文件。
actionpack/CHANGELOG.md
浏览文件 @
9c91c168
*
Fix
`assert_template`
not being able to assert that no files were rendered.
*Guo Xiang Tan*
*
Extract source code for the entire exception stack trace for
better debugging and diagnosis.
...
...
actionpack/lib/action_controller/test_case.rb
浏览文件 @
9c91c168
...
...
@@ -91,6 +91,13 @@ def reset_template_assertion
# # assert that no partials were rendered
# assert_template partial: false
#
# # assert that a file was rendered
# assert_template file: "README.rdoc"
#
# # assert that no file was rendered
# assert_template file: nil
# assert_template file: false
#
# In a view test case, you can also assert that specific locals are passed
# to partials:
#
...
...
@@ -140,6 +147,8 @@ def assert_template(options = {}, message = nil)
if
options
[
:file
]
assert_includes
@_files
.
keys
,
options
[
:file
]
elsif
options
.
key?
(
:file
)
assert
@_files
.
blank?
,
"expected no files but
#{
@_files
.
keys
}
was rendered"
end
if
expected_partial
=
options
[
:partial
]
...
...
actionpack/test/controller/action_pack_assertions_test.rb
浏览文件 @
9c91c168
...
...
@@ -488,6 +488,11 @@ def test_with_file_failure
assert_raise
(
ActiveSupport
::
TestCase
::
Assertion
)
do
assert_template
:file
=>
'test/hello_world'
end
get
:render_file_absolute_path
assert_raise
(
ActiveSupport
::
TestCase
::
Assertion
)
do
assert_template
file:
nil
end
end
def
test_with_nil_passes_when_no_template_rendered
...
...
@@ -612,6 +617,24 @@ def test_assert_template_reset_between_requests
get
:nothing
assert_template
nil
get
:partial
assert_template
partial:
'test/_partial'
get
:nothing
assert_template
partial:
nil
get
:render_with_layout
assert_template
layout:
'layouts/standard'
get
:nothing
assert_template
layout:
nil
get
:render_file_relative_path
assert_template
file:
'README.rdoc'
get
:nothing
assert_template
file:
nil
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录