Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0d48408d
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,发现更多精彩内容 >>
提交
0d48408d
编写于
12月 15, 2008
作者:
J
Jeremy Kemper
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of git@github.com:rails/rails
上级
262fef7e
4966076d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
5 deletion
+19
-5
actionpack/lib/action_controller/assertions/selector_assertions.rb
...k/lib/action_controller/assertions/selector_assertions.rb
+1
-1
actionpack/lib/action_controller/integration.rb
actionpack/lib/action_controller/integration.rb
+1
-3
actionpack/lib/action_controller/mime_type.rb
actionpack/lib/action_controller/mime_type.rb
+8
-0
actionpack/lib/action_controller/test_process.rb
actionpack/lib/action_controller/test_process.rb
+1
-1
actionpack/test/controller/mime_type_test.rb
actionpack/test/controller/mime_type_test.rb
+8
-0
未找到文件。
actionpack/lib/action_controller/assertions/selector_assertions.rb
浏览文件 @
0d48408d
...
...
@@ -587,7 +587,7 @@ def assert_select_email(&block)
def
response_from_page_or_rjs
()
content_type
=
@response
.
content_type
if
content_type
&&
content_type
=~
/text\/javascript/
if
content_type
&&
Mime
::
JS
=~
content_type
body
=
@response
.
body
.
dup
root
=
HTML
::
Node
.
new
(
nil
)
...
...
actionpack/lib/action_controller/integration.rb
浏览文件 @
0d48408d
...
...
@@ -227,9 +227,7 @@ def head(path, parameters = nil, headers = nil)
def
xml_http_request
(
request_method
,
path
,
parameters
=
nil
,
headers
=
nil
)
headers
||=
{}
headers
[
'X-Requested-With'
]
=
'XMLHttpRequest'
headers
[
'Accept'
]
||=
'text/javascript, text/html, application/xml, '
+
'text/xml, */*'
headers
[
'Accept'
]
||=
[
Mime
::
JS
,
Mime
::
HTML
,
Mime
::
XML
,
'text/xml'
,
Mime
::
ALL
].
join
(
', '
)
process
(
request_method
,
path
,
parameters
,
headers
)
end
alias
xhr
:xml_http_request
...
...
actionpack/lib/action_controller/mime_type.rb
浏览文件 @
0d48408d
...
...
@@ -176,6 +176,14 @@ def ==(mime_type)
end
end
def
=~
(
mime_type
)
return
false
if
mime_type
.
blank?
regexp
=
Regexp
.
new
(
mime_type
.
to_s
)
(
@synonyms
+
[
self
]).
any?
do
|
synonym
|
synonym
.
to_s
=~
regexp
end
end
# Returns true if Action Pack should check requests using this Mime Type for possible request forgery. See
# ActionController::RequestForgeryProtection.
def
verify_request?
...
...
actionpack/lib/action_controller/test_process.rb
浏览文件 @
0d48408d
...
...
@@ -413,7 +413,7 @@ def process(action, parameters = nil, session = nil, flash = nil)
def
xml_http_request
(
request_method
,
action
,
parameters
=
nil
,
session
=
nil
,
flash
=
nil
)
@request
.
env
[
'HTTP_X_REQUESTED_WITH'
]
=
'XMLHttpRequest'
@request
.
env
[
'HTTP_ACCEPT'
]
=
'text/javascript, text/html, application/xml, text/xml, */*'
@request
.
env
[
'HTTP_ACCEPT'
]
=
[
Mime
::
JS
,
Mime
::
HTML
,
Mime
::
XML
,
'text/xml'
,
Mime
::
ALL
].
join
(
', '
)
returning
__send__
(
request_method
,
action
,
parameters
,
session
,
flash
)
do
@request
.
env
.
delete
'HTTP_X_REQUESTED_WITH'
@request
.
env
.
delete
'HTTP_ACCEPT'
...
...
actionpack/test/controller/mime_type_test.rb
浏览文件 @
0d48408d
...
...
@@ -81,4 +81,12 @@ def test_verifiable_mime_types
assert
verified
.
each
{
|
type
|
assert
Mime
.
const_get
(
type
.
to_s
.
upcase
).
verify_request?
,
"Verifiable Mime Type is not verified:
#{
type
.
inspect
}
"
}
assert
unverified
.
each
{
|
type
|
assert
!
Mime
.
const_get
(
type
.
to_s
.
upcase
).
verify_request?
,
"Nonverifiable Mime Type is verified:
#{
type
.
inspect
}
"
}
end
def
test_regexp_matcher
assert
Mime
::
JS
=~
"text/javascript"
assert
Mime
::
JS
=~
"application/javascript"
assert
Mime
::
JS
!~
"text/html"
assert
!
(
Mime
::
JS
!~
"text/javascript"
)
assert
!
(
Mime
::
JS
!~
"application/javascript"
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录