Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
67688aa7
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,发现更多精彩内容 >>
提交
67688aa7
编写于
12月 06, 2015
作者:
E
Eileen M. Uchitelle
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22453 from wjessop/use_action_dispatch_default_tld_length
Test against the real value of tld_length unless explicitly set
上级
0127a030
e8bfaa58
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
30 addition
and
26 deletion
+30
-26
actionpack/test/dispatch/request_test.rb
actionpack/test/dispatch/request_test.rb
+30
-26
未找到文件。
actionpack/test/dispatch/request_test.rb
浏览文件 @
67688aa7
...
...
@@ -4,9 +4,13 @@ class BaseRequestTest < ActiveSupport::TestCase
def
setup
@env
=
{
:ip_spoofing_check
=>
true
,
:tld_length
=>
1
,
"rack.input"
=>
"foo"
}
@original_tld_length
=
ActionDispatch
::
Http
::
URL
.
tld_length
end
def
teardown
ActionDispatch
::
Http
::
URL
.
tld_length
=
@original_tld_length
end
def
url_for
(
options
=
{})
...
...
@@ -19,9 +23,9 @@ def stub_request(env = {})
ip_spoofing_check
=
env
.
key?
(
:ip_spoofing_check
)
?
env
.
delete
(
:ip_spoofing_check
)
:
true
@trusted_proxies
||=
nil
ip_app
=
ActionDispatch
::
RemoteIp
.
new
(
Proc
.
new
{
},
ip_spoofing_check
,
@trusted_proxies
)
tld_length
=
env
.
key?
(
:tld_length
)
?
env
.
delete
(
:tld_length
)
:
1
ActionDispatch
::
Http
::
URL
.
tld_length
=
env
.
delete
(
:tld_length
)
if
env
.
key?
(
:tld_length
)
ip_app
.
call
(
env
)
ActionDispatch
::
Http
::
URL
.
tld_length
=
tld_length
env
=
@env
.
merge
(
env
)
ActionDispatch
::
Request
.
new
(
env
)
...
...
@@ -254,15 +258,6 @@ class RequestIP < BaseRequestTest
class
RequestDomain
<
BaseRequestTest
test
"domains"
do
request
=
stub_request
'HTTP_HOST'
=>
'www.rubyonrails.org'
assert_equal
"rubyonrails.org"
,
request
.
domain
request
=
stub_request
'HTTP_HOST'
=>
"www.rubyonrails.co.uk"
assert_equal
"rubyonrails.co.uk"
,
request
.
domain
(
2
)
request
=
stub_request
'HTTP_HOST'
=>
"www.rubyonrails.co.uk"
,
:tld_length
=>
2
assert_equal
"rubyonrails.co.uk"
,
request
.
domain
request
=
stub_request
'HTTP_HOST'
=>
"192.168.1.200"
assert_nil
request
.
domain
...
...
@@ -271,25 +266,18 @@ class RequestDomain < BaseRequestTest
request
=
stub_request
'HTTP_HOST'
=>
"192.168.1.200.com"
assert_equal
"200.com"
,
request
.
domain
end
test
"subdomains"
do
request
=
stub_request
'HTTP_HOST'
=>
"www.rubyonrails.org"
assert_equal
%w( www )
,
request
.
subdomains
assert_equal
"www"
,
request
.
subdomain
request
=
stub_request
'HTTP_HOST'
=>
'www.rubyonrails.org'
assert_equal
"rubyonrails.org"
,
request
.
domain
request
=
stub_request
'HTTP_HOST'
=>
"www.rubyonrails.co.uk"
assert_equal
%w( www )
,
request
.
subdomains
(
2
)
assert_equal
"www"
,
request
.
subdomain
(
2
)
request
=
stub_request
'HTTP_HOST'
=>
"dev.www.rubyonrails.co.uk"
assert_equal
%w( dev www )
,
request
.
subdomains
(
2
)
assert_equal
"dev.www"
,
request
.
subdomain
(
2
)
assert_equal
"rubyonrails.co.uk"
,
request
.
domain
(
2
)
request
=
stub_request
'HTTP_HOST'
=>
"
dev.
www.rubyonrails.co.uk"
,
:tld_length
=>
2
assert_equal
%w( dev www )
,
request
.
subdomains
assert_equal
"dev.www"
,
request
.
subdomain
request
=
stub_request
'HTTP_HOST'
=>
"www.rubyonrails.co.uk"
,
:tld_length
=>
2
assert_equal
"rubyonrails.co.uk"
,
request
.
domain
end
test
"subdomains"
do
request
=
stub_request
'HTTP_HOST'
=>
"foobar.foobar.com"
assert_equal
%w( foobar )
,
request
.
subdomains
assert_equal
"foobar"
,
request
.
subdomain
...
...
@@ -309,6 +297,22 @@ class RequestDomain < BaseRequestTest
request
=
stub_request
'HTTP_HOST'
=>
nil
assert_equal
[],
request
.
subdomains
assert_equal
""
,
request
.
subdomain
request
=
stub_request
'HTTP_HOST'
=>
"www.rubyonrails.org"
assert_equal
%w( www )
,
request
.
subdomains
assert_equal
"www"
,
request
.
subdomain
request
=
stub_request
'HTTP_HOST'
=>
"www.rubyonrails.co.uk"
assert_equal
%w( www )
,
request
.
subdomains
(
2
)
assert_equal
"www"
,
request
.
subdomain
(
2
)
request
=
stub_request
'HTTP_HOST'
=>
"dev.www.rubyonrails.co.uk"
assert_equal
%w( dev www )
,
request
.
subdomains
(
2
)
assert_equal
"dev.www"
,
request
.
subdomain
(
2
)
request
=
stub_request
'HTTP_HOST'
=>
"dev.www.rubyonrails.co.uk"
,
:tld_length
=>
2
assert_equal
%w( dev www )
,
request
.
subdomains
assert_equal
"dev.www"
,
request
.
subdomain
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录