Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
35fe3107
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,发现更多精彩内容 >>
提交
35fe3107
编写于
7月 18, 2012
作者:
B
Brian John
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean up Sweeper controller accessor when an Error is raised
上级
e482100d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
2 deletion
+18
-2
actionpack/lib/action_controller/caching/sweeping.rb
actionpack/lib/action_controller/caching/sweeping.rb
+7
-2
actionpack/test/controller/filters_test.rb
actionpack/test/controller/filters_test.rb
+11
-0
未找到文件。
actionpack/lib/action_controller/caching/sweeping.rb
浏览文件 @
35fe3107
...
...
@@ -68,14 +68,14 @@ def before(controller)
def
after
(
controller
)
self
.
controller
=
controller
callback
(
:after
)
if
controller
.
perform_caching
# Clean up, so that the controller can be collected after this request
self
.
controller
=
nil
end
def
around
(
controller
)
before
(
controller
)
yield
after
(
controller
)
ensure
clean_up
end
protected
...
...
@@ -90,6 +90,11 @@ def assigns(key)
end
private
def
clean_up
# Clean up, so that the controller can be collected after this request
self
.
controller
=
nil
end
def
callback
(
timing
)
controller_callback_method_name
=
"
#{
timing
}
_
#{
controller
.
controller_name
.
underscore
}
"
action_callback_method_name
=
"
#{
controller_callback_method_name
}
_
#{
controller
.
action_name
}
"
...
...
actionpack/test/controller/filters_test.rb
浏览文件 @
35fe3107
...
...
@@ -505,6 +505,10 @@ class SweeperTestController < ActionController::Base
def
show
render
:text
=>
'hello world'
end
def
error
raise
StandardError
.
new
end
end
class
ImplicitActionsController
<
ActionController
::
Base
...
...
@@ -534,6 +538,13 @@ def test_sweeper_should_not_block_rendering
assert_equal
'hello world'
,
response
.
body
end
def
test_sweeper_should_clean_up_if_exception_is_raised
assert_raise
StandardError
do
test_process
(
SweeperTestController
,
'error'
)
end
assert_nil
AppSweeper
.
instance
.
controller
end
def
test_before_method_of_sweeper_should_always_return_true
sweeper
=
ActionController
::
Caching
::
Sweeper
.
send
(
:new
)
assert
sweeper
.
before
(
TestController
.
new
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录