Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
b28fc685
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,发现更多精彩内容 >>
提交
b28fc685
编写于
1月 14, 2013
作者:
A
Andrew White
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure port is set when passed via the process method
上级
db06d128
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
58 addition
and
1 deletion
+58
-1
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+5
-0
actionpack/lib/action_dispatch/testing/integration.rb
actionpack/lib/action_dispatch/testing/integration.rb
+1
-1
actionpack/test/controller/integration_test.rb
actionpack/test/controller/integration_test.rb
+52
-0
未找到文件。
actionpack/CHANGELOG.md
浏览文件 @
b28fc685
## Rails 4.0.0 (unreleased) ##
## Rails 4.0.0 (unreleased) ##
*
Fix a bug in integration tests where setting the port via a url passed to
the process method was ignored when constructing the request environment.
*Andrew White*
*
Allow
`:selected`
to be set on
`date_select`
tag helper.
*
Allow
`:selected`
to be set on
`date_select`
tag helper.
*Colin Burn-Murdoch*
*Colin Burn-Murdoch*
...
...
actionpack/lib/action_dispatch/testing/integration.rb
浏览文件 @
b28fc685
...
@@ -273,7 +273,7 @@ def process(method, path, parameters = nil, rack_env = nil)
...
@@ -273,7 +273,7 @@ def process(method, path, parameters = nil, rack_env = nil)
if
path
=~
%r{://}
if
path
=~
%r{://}
location
=
URI
.
parse
(
path
)
location
=
URI
.
parse
(
path
)
https!
URI
::
HTTPS
===
location
if
location
.
scheme
https!
URI
::
HTTPS
===
location
if
location
.
scheme
host!
location
.
host
if
location
.
host
host!
"
#{
location
.
host
}
:
#{
location
.
port
}
"
if
location
.
host
path
=
location
.
query
?
"
#{
location
.
path
}
?
#{
location
.
query
}
"
:
location
.
path
path
=
location
.
query
?
"
#{
location
.
path
}
?
#{
location
.
query
}
"
:
location
.
path
end
end
...
...
actionpack/test/controller/integration_test.rb
浏览文件 @
b28fc685
...
@@ -466,6 +466,58 @@ def test_generate_url_with_controller
...
@@ -466,6 +466,58 @@ def test_generate_url_with_controller
assert_equal
'http://www.example.com/foo'
,
url_for
(
:controller
=>
"foo"
)
assert_equal
'http://www.example.com/foo'
,
url_for
(
:controller
=>
"foo"
)
end
end
def
test_port_via_host!
with_test_route_set
do
host!
'www.example.com:8080'
get
'/get'
assert_equal
8080
,
request
.
port
end
end
def
test_port_via_process
with_test_route_set
do
get
'http://www.example.com:8080/get'
assert_equal
8080
,
request
.
port
end
end
def
test_https_and_port_via_host_and_https!
with_test_route_set
do
host!
'www.example.com'
https!
true
get
'/get'
assert_equal
443
,
request
.
port
assert_equal
true
,
request
.
ssl?
host!
'www.example.com:443'
https!
true
get
'/get'
assert_equal
443
,
request
.
port
assert_equal
true
,
request
.
ssl?
host!
'www.example.com:8443'
https!
true
get
'/get'
assert_equal
8443
,
request
.
port
assert_equal
true
,
request
.
ssl?
end
end
def
test_https_and_port_via_process
with_test_route_set
do
get
'https://www.example.com/get'
assert_equal
443
,
request
.
port
assert_equal
true
,
request
.
ssl?
get
'https://www.example.com:8443/get'
assert_equal
8443
,
request
.
port
assert_equal
true
,
request
.
ssl?
end
end
private
private
def
with_test_route_set
def
with_test_route_set
with_routing
do
|
set
|
with_routing
do
|
set
|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录