Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3bc73df4
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,发现更多精彩内容 >>
提交
3bc73df4
编写于
5月 14, 2012
作者:
P
Piotr Sarnacki
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6317 from korny/routes-draw-backtrace
add tests and external file backtrace for Routing::Mapper#draw
上级
8ad58af4
0d3172c4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
55 addition
and
3 deletion
+55
-3
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+4
-3
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+49
-0
actionpack/test/fixtures/routes/bogus.rb
actionpack/test/fixtures/routes/bogus.rb
+1
-0
actionpack/test/fixtures/routes/external.rb
actionpack/test/fixtures/routes/external.rb
+1
-0
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
3bc73df4
...
...
@@ -1336,10 +1336,11 @@ def draw(name)
msg
=
"Your router tried to #draw the external file
#{
name
}
.rb,
\n
"
\
"but the file was not found in:
\n\n
"
msg
+=
@draw_paths
.
map
{
|
_path
|
" *
#{
_path
}
"
}.
join
(
"
\n
"
)
raise
msg
raise
ArgumentError
,
msg
end
instance_eval
(
path
.
join
(
"
#{
name
}
.rb"
).
read
)
route_path
=
path
.
join
(
"
#{
name
}
.rb"
)
instance_eval
(
route_path
.
read
,
route_path
.
to_s
)
end
# match 'path' => 'controller#action'
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
3bc73df4
...
...
@@ -2324,6 +2324,55 @@ def test_controller_options
end
end
class
TestDrawExternalFile
<
ActionDispatch
::
IntegrationTest
class
ExternalController
<
ActionController
::
Base
def
index
render
:text
=>
"external#index"
end
end
DRAW_PATH
=
Pathname
.
new
(
File
.
expand_path
(
'../../fixtures/routes'
,
__FILE__
))
DefaultScopeRoutes
=
ActionDispatch
::
Routing
::
RouteSet
.
new
.
tap
do
|
app
|
app
.
draw_paths
<<
DRAW_PATH
end
def
app
DefaultScopeRoutes
end
def
test_draw_external_file
DefaultScopeRoutes
.
draw
do
scope
:module
=>
'test_draw_external_file'
do
draw
:external
end
end
get
'/external'
assert_equal
"external#index"
,
@response
.
body
end
def
test_draw_nonexistent_file
exception
=
assert_raise
ArgumentError
do
DefaultScopeRoutes
.
draw
do
draw
:nonexistent
end
end
assert_match
'Your router tried to #draw the external file nonexistent.rb'
,
exception
.
message
assert_match
DRAW_PATH
.
to_s
,
exception
.
message
end
def
test_draw_bogus_file
exception
=
assert_raise
NoMethodError
do
DefaultScopeRoutes
.
draw
do
draw
:bogus
end
end
assert_match
"undefined method `wrong'"
,
exception
.
message
assert_match
'test/fixtures/routes/bogus.rb:1'
,
exception
.
backtrace
.
first
end
end
class
TestDefaultScope
<
ActionDispatch
::
IntegrationTest
module
::
Blog
class
PostsController
<
ActionController
::
Base
...
...
actionpack/test/fixtures/routes/bogus.rb
0 → 100644
浏览文件 @
3bc73df4
wrong
:route
actionpack/test/fixtures/routes/external.rb
0 → 100644
浏览文件 @
3bc73df4
get
'/external'
=>
'external#index'
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录