Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
cc10288e
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,发现更多精彩内容 >>
提交
cc10288e
编写于
7月 24, 2014
作者:
G
Guo Xiang Tan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bug fix for assert_template when opening a new session.
See
https://github.com/rails/rails/pull/16234#commitcomment-7115670
.
上级
b17330cf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
5 deletion
+49
-5
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_controller/test_case.rb
+9
-5
actionpack/test/dispatch/template_assertions_test.rb
actionpack/test/dispatch/template_assertions_test.rb
+40
-0
未找到文件。
actionpack/lib/action_controller/test_case.rb
浏览文件 @
cc10288e
...
...
@@ -12,8 +12,13 @@ module TemplateAssertions
teardown
:teardown_subscriptions
end
RENDER_TEMPLATE_INSTANCE_VARIABLES
=
%w{partials templates layouts files}
.
freeze
def
setup_subscriptions
reset_template_assertion
RENDER_TEMPLATE_INSTANCE_VARIABLES
.
each
do
|
instance_variable
|
instance_variable_set
(
"@_
#{
instance_variable
}
"
,
Hash
.
new
(
0
))
end
@_subscribers
=
[]
@_subscribers
<<
ActiveSupport
::
Notifications
.
subscribe
(
"render_template.action_view"
)
do
|
_name
,
_start
,
_finish
,
_id
,
payload
|
...
...
@@ -58,10 +63,9 @@ def process(*args)
end
def
reset_template_assertion
@_partials
=
Hash
.
new
(
0
)
@_templates
=
Hash
.
new
(
0
)
@_layouts
=
Hash
.
new
(
0
)
@_files
=
Hash
.
new
(
0
)
RENDER_TEMPLATE_INSTANCE_VARIABLES
.
each
do
|
instance_variable
|
instance_variable_get
(
"@_
#{
instance_variable
}
"
).
clear
end
end
# Asserts that the request was rendered with the appropriate template file or partials.
...
...
actionpack/test/dispatch/template_assertions_test.rb
浏览文件 @
cc10288e
...
...
@@ -55,4 +55,44 @@ def test_assert_file_reset_between_requests
get
'/assert_template/render_nothing'
assert_template
file:
nil
end
def
test_template_reset_between_requests_when_opening_a_session
open_session
do
|
session
|
session
.
get
'/assert_template/render_with_template'
session
.
assert_template
'test/hello_world'
session
.
get
'/assert_template/render_nothing'
session
.
assert_template
nil
end
end
def
test_partial_reset_between_requests_when_opening_a_session
open_session
do
|
session
|
session
.
get
'/assert_template/render_with_partial'
session
.
assert_template
partial:
'test/_partial'
session
.
get
'/assert_template/render_nothing'
session
.
assert_template
partial:
nil
end
end
def
test_layout_reset_between_requests_when_opening_a_session
open_session
do
|
session
|
session
.
get
'/assert_template/render_with_layout'
session
.
assert_template
layout:
'layouts/standard'
session
.
get
'/assert_template/render_nothing'
session
.
assert_template
layout:
nil
end
end
def
test_file_reset_between_requests_when_opening_a_session
open_session
do
|
session
|
session
.
get
'/assert_template/render_with_file'
session
.
assert_template
file:
'README.rdoc'
session
.
get
'/assert_template/render_nothing'
session
.
assert_template
file:
nil
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录