Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3513f80e
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,发现更多精彩内容 >>
提交
3513f80e
编写于
11月 28, 2015
作者:
A
Arthur Nogueira Neves
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22371 from yui-knk/better_mount_error
Brush up errors of `ActionDispatch::Routing::Mapper#mount`
上级
5217db2a
f8f7e66f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
7 deletion
+22
-7
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+9
-6
actionpack/test/dispatch/mapper_test.rb
actionpack/test/dispatch/mapper_test.rb
+13
-1
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
3513f80e
...
...
@@ -600,17 +600,20 @@ def match(path, options=nil)
def
mount
(
app
,
options
=
nil
)
if
options
path
=
options
.
delete
(
:at
)
else
unless
Hash
===
app
raise
ArgumentError
,
"must be called with mount point"
end
elsif
Hash
===
app
options
=
app
app
,
path
=
options
.
find
{
|
k
,
_
|
k
.
respond_to?
(
:call
)
}
options
.
delete
(
app
)
if
app
end
raise
"A rack application must be specified"
unless
path
raise
ArgumentError
,
"A rack application must be specified"
unless
app
.
respond_to?
(
:call
)
raise
ArgumentError
,
<<-
MSG
.
strip_heredoc
unless
path
Must be called with mount point
mount SomeRackApp, at: "some_route"
or
mount(SomeRackApp => "some_route")
MSG
rails_app
=
rails_app?
app
options
[
:as
]
||=
app_name
(
app
,
rails_app
)
...
...
actionpack/test/dispatch/mapper_test.rb
浏览文件 @
3513f80e
...
...
@@ -158,7 +158,7 @@ def test_map_wildcard_with_format_true
assert_equal
'/*path.:format'
,
fakeset
.
asts
.
first
.
to_s
end
def
test_raising_
helpful_error_on_invalid_arguments
def
test_raising_
error_when_path_is_not_passed
fakeset
=
FakeSet
.
new
mapper
=
Mapper
.
new
fakeset
app
=
lambda
{
|
env
|
[
200
,
{},
[
""
]]
}
...
...
@@ -166,6 +166,18 @@ def test_raising_helpful_error_on_invalid_arguments
mapper
.
mount
app
end
end
def
test_raising_error_when_rack_app_is_not_passed
fakeset
=
FakeSet
.
new
mapper
=
Mapper
.
new
fakeset
assert_raises
ArgumentError
do
mapper
.
mount
10
,
as:
"exciting"
end
assert_raises
ArgumentError
do
mapper
.
mount
as:
"exciting"
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录