Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
53b91b11
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,发现更多精彩内容 >>
提交
53b91b11
编写于
9月 24, 2010
作者:
E
Emilio Tagua
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid uninitialized variable warning, reuse @integration_session.
上级
24ef32fe
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
8 deletion
+14
-8
actionpack/lib/action_dispatch/testing/integration.rb
actionpack/lib/action_dispatch/testing/integration.rb
+14
-8
未找到文件。
actionpack/lib/action_dispatch/testing/integration.rb
浏览文件 @
53b91b11
...
@@ -182,6 +182,7 @@ def initialize(app)
...
@@ -182,6 +182,7 @@ def initialize(app)
reset!
reset!
end
end
remove_method
:default_url_options
def
default_url_options
def
default_url_options
{
:host
=>
host
,
:protocol
=>
https?
?
"https"
:
"http"
}
{
:host
=>
host
,
:protocol
=>
https?
?
"https"
:
"http"
}
end
end
...
@@ -319,10 +320,10 @@ def reset!
...
@@ -319,10 +320,10 @@ def reset!
%w(get post put head delete cookies assigns
%w(get post put head delete cookies assigns
xml_http_request xhr get_via_redirect post_via_redirect)
.
each
do
|
method
|
xml_http_request xhr get_via_redirect post_via_redirect)
.
each
do
|
method
|
define_method
(
method
)
do
|*
args
|
define_method
(
method
)
do
|*
args
|
reset!
unless
@
integration_session
reset!
unless
integration_session
# reset the html_document variable, but only for new get/post calls
# reset the html_document variable, but only for new get/post calls
@html_document
=
nil
unless
%w(cookies assigns)
.
include?
(
method
)
@html_document
=
nil
unless
%w(cookies assigns)
.
include?
(
method
)
@
integration_session
.
__send__
(
method
,
*
args
).
tap
do
integration_session
.
__send__
(
method
,
*
args
).
tap
do
copy_session_variables!
copy_session_variables!
end
end
end
end
...
@@ -347,7 +348,7 @@ def open_session(app = nil)
...
@@ -347,7 +348,7 @@ def open_session(app = nil)
# Copy the instance variables from the current session instance into the
# Copy the instance variables from the current session instance into the
# test instance.
# test instance.
def
copy_session_variables!
#:nodoc:
def
copy_session_variables!
#:nodoc:
return
unless
@
integration_session
return
unless
integration_session
%w(controller response request)
.
each
do
|
var
|
%w(controller response request)
.
each
do
|
var
|
instance_variable_set
(
"@
#{
var
}
"
,
@integration_session
.
__send__
(
var
))
instance_variable_set
(
"@
#{
var
}
"
,
@integration_session
.
__send__
(
var
))
end
end
...
@@ -357,21 +358,26 @@ def copy_session_variables! #:nodoc:
...
@@ -357,21 +358,26 @@ def copy_session_variables! #:nodoc:
include
ActionDispatch
::
Routing
::
UrlFor
include
ActionDispatch
::
Routing
::
UrlFor
def
url_options
def
url_options
reset!
unless
@
integration_session
reset!
unless
integration_session
@
integration_session
.
url_options
integration_session
.
url_options
end
end
# Delegate unhandled messages to the current session instance.
# Delegate unhandled messages to the current session instance.
def
method_missing
(
sym
,
*
args
,
&
block
)
def
method_missing
(
sym
,
*
args
,
&
block
)
reset!
unless
@
integration_session
reset!
unless
integration_session
if
@
integration_session
.
respond_to?
(
sym
)
if
integration_session
.
respond_to?
(
sym
)
@
integration_session
.
__send__
(
sym
,
*
args
,
&
block
).
tap
do
integration_session
.
__send__
(
sym
,
*
args
,
&
block
).
tap
do
copy_session_variables!
copy_session_variables!
end
end
else
else
super
super
end
end
end
end
private
def
integration_session
@integration_session
||=
nil
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录