Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
ffca8839
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,发现更多精彩内容 >>
未验证
提交
ffca8839
编写于
8月 20, 2018
作者:
R
Ryuta Kamizono
提交者:
GitHub
8月 20, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #33662 from yskkin/multi_word_route
Fix `rails routes -c` for controller name consists of multiple word.
上级
3e3a0d1c
e2d0b3b3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
65 addition
and
23 deletion
+65
-23
actionpack/lib/action_dispatch/routing/inspector.rb
actionpack/lib/action_dispatch/routing/inspector.rb
+1
-1
railties/test/commands/routes_test.rb
railties/test/commands/routes_test.rb
+64
-22
未找到文件。
actionpack/lib/action_dispatch/routing/inspector.rb
浏览文件 @
ffca8839
...
...
@@ -83,7 +83,7 @@ def format(formatter, filter = {})
private
def
normalize_filter
(
filter
)
if
filter
[
:controller
]
{
controller:
/
#{
filter
[
:controller
].
downcase
.
sub
(
/_?controller\z/
,
''
).
sub
(
'::'
,
'/'
)
}
/
}
{
controller:
/
#{
filter
[
:controller
].
underscore
.
sub
(
/_?controller\z/
,
""
)
}
/
}
elsif
filter
[
:grep
]
{
controller:
/
#{
filter
[
:grep
]
}
/
,
action:
/
#{
filter
[
:grep
]
}
/
,
verb:
/
#{
filter
[
:grep
]
}
/
,
name:
/
#{
filter
[
:grep
]
}
/
,
path:
/
#{
filter
[
:grep
]
}
/
}
...
...
railties/test/commands/routes_test.rb
浏览文件 @
ffca8839
...
...
@@ -13,20 +13,33 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
app_file
"config/routes.rb"
,
<<-
RUBY
Rails.application.routes.draw do
resource :post
resource :user_permission
end
RUBY
expected_output
=
[
" Prefix Verb URI Pattern Controller#Action"
,
" new_post GET /post/new(.:format) posts#new"
,
"edit_post GET /post/edit(.:format) posts#edit"
,
" post GET /post(.:format) posts#show"
,
" PATCH /post(.:format) posts#update"
,
" PUT /post(.:format) posts#update"
,
" DELETE /post(.:format) posts#destroy"
,
" POST /post(.:format) posts#create
\n
"
].
join
(
"
\n
"
)
expected_
post_
output
=
[
" Prefix Verb URI Pattern Controller#Action"
,
" new_post GET /post/new(.:format) posts#new"
,
"edit_post GET /post/edit(.:format) posts#edit"
,
" post GET /post(.:format) posts#show"
,
" PATCH /post(.:format) posts#update"
,
" PUT /post(.:format) posts#update"
,
" DELETE /post(.:format) posts#destroy"
,
" POST /post(.:format) posts#create
\n
"
].
join
(
"
\n
"
)
output
=
run_routes_command
([
"-c"
,
"PostController"
])
assert_equal
expected_output
,
output
assert_equal
expected_post_output
,
output
expected_perm_output
=
[
" Prefix Verb URI Pattern Controller#Action"
,
" new_user_permission GET /user_permission/new(.:format) user_permissions#new"
,
"edit_user_permission GET /user_permission/edit(.:format) user_permissions#edit"
,
" user_permission GET /user_permission(.:format) user_permissions#show"
,
" PATCH /user_permission(.:format) user_permissions#update"
,
" PUT /user_permission(.:format) user_permissions#update"
,
" DELETE /user_permission(.:format) user_permissions#destroy"
,
" POST /user_permission(.:format) user_permissions#create
\n
"
].
join
(
"
\n
"
)
output
=
run_routes_command
([
"-c"
,
"UserPermissionController"
])
assert_equal
expected_perm_output
,
output
end
test
"rails routes with global search key"
do
...
...
@@ -64,17 +77,30 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
Rails.application.routes.draw do
get '/cart', to: 'cart#show'
get '/basketball', to: 'basketball#index'
get '/user_permission', to: 'user_permission#index'
end
RUBY
expected_cart_output
=
"Prefix Verb URI Pattern Controller#Action
\n
cart GET /cart(.:format) cart#show
\n
"
output
=
run_routes_command
([
"-c"
,
"cart"
])
assert_equal
"Prefix Verb URI Pattern Controller#Action
\n
cart GET /cart(.:format) cart#show
\n
"
,
output
assert_equal
expected_cart_output
,
output
output
=
run_routes_command
([
"-c"
,
"Cart"
])
assert_equal
"Prefix Verb URI Pattern Controller#Action
\n
cart GET /cart(.:format) cart#show
\n
"
,
output
assert_equal
expected_cart_output
,
output
output
=
run_routes_command
([
"-c"
,
"CartController"
])
assert_equal
"Prefix Verb URI Pattern Controller#Action
\n
cart GET /cart(.:format) cart#show
\n
"
,
output
assert_equal
expected_cart_output
,
output
expected_perm_output
=
[
" Prefix Verb URI Pattern Controller#Action"
,
"user_permission GET /user_permission(.:format) user_permission#index
\n
"
].
join
(
"
\n
"
)
output
=
run_routes_command
([
"-c"
,
"user_permission"
])
assert_equal
expected_perm_output
,
output
output
=
run_routes_command
([
"-c"
,
"UserPermission"
])
assert_equal
expected_perm_output
,
output
output
=
run_routes_command
([
"-c"
,
"UserPermissionController"
])
assert_equal
expected_perm_output
,
output
end
test
"rails routes with namespaced controller search key"
do
...
...
@@ -82,24 +108,40 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
Rails.application.routes.draw do
namespace :admin do
resource :post
resource :user_permission
end
end
RUBY
expected_output
=
[
" Prefix Verb URI Pattern Controller#Action"
,
" new_admin_post GET /admin/post/new(.:format) admin/posts#new"
,
"edit_admin_post GET /admin/post/edit(.:format) admin/posts#edit"
,
" admin_post GET /admin/post(.:format) admin/posts#show"
,
" PATCH /admin/post(.:format) admin/posts#update"
,
" PUT /admin/post(.:format) admin/posts#update"
,
" DELETE /admin/post(.:format) admin/posts#destroy"
,
" POST /admin/post(.:format) admin/posts#create
\n
"
].
join
(
"
\n
"
)
expected_
post_
output
=
[
" Prefix Verb URI Pattern Controller#Action"
,
" new_admin_post GET /admin/post/new(.:format) admin/posts#new"
,
"edit_admin_post GET /admin/post/edit(.:format) admin/posts#edit"
,
" admin_post GET /admin/post(.:format) admin/posts#show"
,
" PATCH /admin/post(.:format) admin/posts#update"
,
" PUT /admin/post(.:format) admin/posts#update"
,
" DELETE /admin/post(.:format) admin/posts#destroy"
,
" POST /admin/post(.:format) admin/posts#create
\n
"
].
join
(
"
\n
"
)
output
=
run_routes_command
([
"-c"
,
"Admin::PostController"
])
assert_equal
expected_output
,
output
assert_equal
expected_
post_
output
,
output
output
=
run_routes_command
([
"-c"
,
"PostController"
])
assert_equal
expected_output
,
output
assert_equal
expected_post_output
,
output
expected_perm_output
=
[
" Prefix Verb URI Pattern Controller#Action"
,
" new_admin_user_permission GET /admin/user_permission/new(.:format) admin/user_permissions#new"
,
"edit_admin_user_permission GET /admin/user_permission/edit(.:format) admin/user_permissions#edit"
,
" admin_user_permission GET /admin/user_permission(.:format) admin/user_permissions#show"
,
" PATCH /admin/user_permission(.:format) admin/user_permissions#update"
,
" PUT /admin/user_permission(.:format) admin/user_permissions#update"
,
" DELETE /admin/user_permission(.:format) admin/user_permissions#destroy"
,
" POST /admin/user_permission(.:format) admin/user_permissions#create
\n
"
].
join
(
"
\n
"
)
output
=
run_routes_command
([
"-c"
,
"Admin::UserPermissionController"
])
assert_equal
expected_perm_output
,
output
output
=
run_routes_command
([
"-c"
,
"UserPermissionController"
])
assert_equal
expected_perm_output
,
output
end
test
"rails routes displays message when no routes are defined"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录