Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ab529c89
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,发现更多精彩内容 >>
提交
ab529c89
编写于
4月 15, 2014
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribing
Fix subscriptions not being unsubscribed.
上级
43f52503
26ff72fe
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
6 deletion
+9
-6
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_controller/test_case.rb
+7
-5
actionview/lib/action_view/test_case.rb
actionview/lib/action_view/test_case.rb
+2
-1
未找到文件。
actionpack/lib/action_controller/test_case.rb
浏览文件 @
ab529c89
...
...
@@ -17,8 +17,9 @@ def setup_subscriptions
@_templates
=
Hash
.
new
(
0
)
@_layouts
=
Hash
.
new
(
0
)
@_files
=
Hash
.
new
(
0
)
@_subscribers
=
[]
ActiveSupport
::
Notifications
.
subscribe
(
"render_template.action_view"
)
do
|
_name
,
_start
,
_finish
,
_id
,
payload
|
@_subscribers
<<
ActiveSupport
::
Notifications
.
subscribe
(
"render_template.action_view"
)
do
|
_name
,
_start
,
_finish
,
_id
,
payload
|
path
=
payload
[
:layout
]
if
path
@_layouts
[
path
]
+=
1
...
...
@@ -28,7 +29,7 @@ def setup_subscriptions
end
end
ActiveSupport
::
Notifications
.
subscribe
(
"!render_template.action_view"
)
do
|
_name
,
_start
,
_finish
,
_id
,
payload
|
@_subscribers
<<
ActiveSupport
::
Notifications
.
subscribe
(
"!render_template.action_view"
)
do
|
_name
,
_start
,
_finish
,
_id
,
payload
|
path
=
payload
[
:virtual_path
]
next
unless
path
partial
=
path
=~
/^.*\/_[^\/]*$/
...
...
@@ -41,7 +42,7 @@ def setup_subscriptions
@_templates
[
path
]
+=
1
end
ActiveSupport
::
Notifications
.
subscribe
(
"!render_template.action_view"
)
do
|
_name
,
_start
,
_finish
,
_id
,
payload
|
@_subscribers
<<
ActiveSupport
::
Notifications
.
subscribe
(
"!render_template.action_view"
)
do
|
_name
,
_start
,
_finish
,
_id
,
payload
|
next
if
payload
[
:virtual_path
]
# files don't have virtual path
path
=
payload
[
:identifier
]
...
...
@@ -53,8 +54,9 @@ def setup_subscriptions
end
def
teardown_subscriptions
ActiveSupport
::
Notifications
.
unsubscribe
(
"render_template.action_view"
)
ActiveSupport
::
Notifications
.
unsubscribe
(
"!render_template.action_view"
)
@_subscribers
.
each
do
|
subscriber
|
ActiveSupport
::
Notifications
.
unsubscribe
(
subscriber
)
end
end
def
process
(
*
args
)
...
...
actionview/lib/action_view/test_case.rb
浏览文件 @
ab529c89
...
...
@@ -235,7 +235,8 @@ def view
:@options
,
:@test_passed
,
:@view
,
:@view_context_class
:@view_context_class
,
:@_subscribers
]
def
_user_defined_ivars
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录