Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
fa292703
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
fa292703
编写于
12月 12, 2019
作者:
A
Aaron Patterson
提交者:
GitHub
12月 12, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #37075 from woahdae/fix-multiple-choice-route-options
Fix route from "(:a)(foo/:b)" when only given :b
上级
285cc001
b44740d4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
50 addition
and
1 deletion
+50
-1
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+3
-1
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+47
-0
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
fa292703
...
...
@@ -412,7 +412,9 @@ def self.normalize_path(path)
path
.
gsub!
(
%r{/(
\(
+)/?}
,
'\1/'
)
# if a path is all optional segments, change the leading "(/" back to
# "/(" so it evaluates to "/" when interpreted with no options.
path
.
sub!
(
%r{^(
\(
+)/}
,
'/\1'
)
if
%r{^(
\(
+[^)]+
\)
){1,}$}
.
match?
(
path
)
# Unless, however, at least one secondary segment consists of a static
# part, ex. "(/:locale)(/pages/:page)"
path
.
sub!
(
%r{^(
\(
+)/}
,
'/\1'
)
if
%r{^(
\(
+[^)]+
\)
)(
\(
+/:[^)]+
\)
)*$}
.
match?
(
path
)
path
end
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
fa292703
...
...
@@ -1412,6 +1412,53 @@ def test_optional_scoped_root_hierarchy
assert_equal
"projects#index"
,
@response
.
body
end
def
test_optional_scoped_root_multiple_choice
draw
do
scope
"(:locale)"
do
scope
"(p/:platform)"
do
scope
"(b/:browser)"
do
root
to:
"projects#index"
end
end
end
end
# Note, in this particular case where we rely on pattern matching instead
# of hierarchy to match parameters in a root path, root_path returns ""
# when given no path parameters.
assert_equal
"/en"
,
root_path
(
locale:
"en"
)
assert_equal
"/p/osx"
,
root_path
(
platform:
"osx"
)
assert_equal
"/en/p/osx"
,
root_path
(
locale:
"en"
,
platform:
"osx"
)
assert_equal
"/b/chrome"
,
root_path
(
browser:
"chrome"
)
assert_equal
"/en/b/chrome"
,
root_path
(
locale:
"en"
,
browser:
"chrome"
)
assert_equal
"/p/osx/b/chrome"
,
root_path
(
platform:
"osx"
,
browser:
"chrome"
)
assert_equal
"/en/p/osx/b/chrome"
,
root_path
(
locale:
"en"
,
platform:
"osx"
,
browser:
"chrome"
)
get
"/en"
assert_equal
"projects#index"
,
@response
.
body
get
"/p/osx"
assert_equal
"projects#index"
,
@response
.
body
get
"/en/p/osx"
assert_equal
"projects#index"
,
@response
.
body
get
"/b/chrome"
assert_equal
"projects#index"
,
@response
.
body
get
"/en/b/chrome"
assert_equal
"projects#index"
,
@response
.
body
get
"/p/osx/b/chrome"
assert_equal
"projects#index"
,
@response
.
body
get
"/en/p/osx/b/chrome"
assert_equal
"projects#index"
,
@response
.
body
end
def
test_scope_with_format_option
draw
do
get
"direct/index"
,
as: :no_format_direct
,
format:
false
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录