Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ad46884a
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,发现更多精彩内容 >>
提交
ad46884a
编写于
2月 19, 2012
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Integration tests support the OPTIONS http method
上级
6219bebb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
2 deletion
+26
-2
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+2
-0
actionpack/lib/action_dispatch/testing/integration.rb
actionpack/lib/action_dispatch/testing/integration.rb
+7
-1
actionpack/test/controller/integration_test.rb
actionpack/test/controller/integration_test.rb
+17
-1
未找到文件。
actionpack/CHANGELOG.md
浏览文件 @
ad46884a
## Rails 4.0.0 (unreleased) ##
*
Integration tests support the
`OPTIONS`
method.
*Jeremy Kemper*
*
`expires_in`
accepts a
`must_revalidate`
flag. If true, "must-revalidate"
is added to the Cache-Control header.
*fxn*
...
...
actionpack/lib/action_dispatch/testing/integration.rb
浏览文件 @
ad46884a
...
...
@@ -56,6 +56,12 @@ def head(path, parameters = nil, headers = nil)
process
:head
,
path
,
parameters
,
headers
end
# Performs a OPTIONS request with the given parameters. See +#get+ for
# more details.
def
options
(
path
,
parameters
=
nil
,
headers
=
nil
)
process
:options
,
path
,
parameters
,
headers
end
# Performs an XMLHttpRequest request with the given parameters, mirroring
# a request from the Prototype library.
#
...
...
@@ -312,7 +318,7 @@ def reset!
@integration_session
=
Integration
::
Session
.
new
(
app
)
end
%w(get post put head delete cookies assigns
%w(get post put head delete
options
cookies assigns
xml_http_request xhr get_via_redirect post_via_redirect)
.
each
do
|
method
|
define_method
(
method
)
do
|*
args
|
reset!
unless
integration_session
...
...
actionpack/test/controller/integration_test.rb
浏览文件 @
ad46884a
...
...
@@ -105,6 +105,12 @@ def test_head
@session
.
head
(
path
,
params
,
headers
)
end
def
test_options
path
=
"/index"
;
params
=
"blah"
;
headers
=
{
:location
=>
'blah'
}
@session
.
expects
(
:process
).
with
(
:options
,
path
,
params
,
headers
)
@session
.
options
(
path
,
params
,
headers
)
end
def
test_xml_http_request_get
path
=
"/index"
;
params
=
"blah"
;
headers
=
{
:location
=>
'blah'
}
headers_after_xhr
=
headers
.
merge
(
...
...
@@ -155,6 +161,16 @@ def test_xml_http_request_head
@session
.
xml_http_request
(
:head
,
path
,
params
,
headers
)
end
def
test_xml_http_request_options
path
=
"/index"
;
params
=
"blah"
;
headers
=
{
:location
=>
'blah'
}
headers_after_xhr
=
headers
.
merge
(
"HTTP_X_REQUESTED_WITH"
=>
"XMLHttpRequest"
,
"HTTP_ACCEPT"
=>
"text/javascript, text/html, application/xml, text/xml, */*"
)
@session
.
expects
(
:process
).
with
(
:options
,
path
,
params
,
headers_after_xhr
)
@session
.
xml_http_request
(
:options
,
path
,
params
,
headers
)
end
def
test_xml_http_request_override_accept
path
=
"/index"
;
params
=
"blah"
;
headers
=
{
:location
=>
'blah'
,
"HTTP_ACCEPT"
=>
"application/xml"
}
headers_after_xhr
=
headers
.
merge
(
...
...
@@ -212,7 +228,7 @@ def test_integration_methods_called
@integration_session
.
stubs
(
:generic_url_rewriter
)
@integration_session
.
stubs
(
:process
)
%w( get post head put delete )
.
each
do
|
verb
|
%w( get post head put delete
options
)
.
each
do
|
verb
|
assert_nothing_raised
(
"'
#{
verb
}
' should use integration test methods"
)
{
__send__
(
verb
,
'/'
)
}
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录