Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
84c8b2fe
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,发现更多精彩内容 >>
提交
84c8b2fe
编写于
10月 10, 2011
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3272 from odorcicd/fix_json_error_root
JSON responder should return errors with :errors root
上级
3456ef11
a0a68ecb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
1 deletion
+35
-1
actionpack/lib/action_controller/metal/responder.rb
actionpack/lib/action_controller/metal/responder.rb
+9
-1
actionpack/test/controller/mime_responds_test.rb
actionpack/test/controller/mime_responds_test.rb
+26
-0
未找到文件。
actionpack/lib/action_controller/metal/responder.rb
浏览文件 @
84c8b2fe
...
...
@@ -253,7 +253,7 @@ def display(resource, given_options={})
end
def
display_errors
controller
.
render
format
=>
resource
.
errors
,
:status
=>
:unprocessable_entity
controller
.
render
format
=>
resource
_
errors
,
:status
=>
:unprocessable_entity
end
# Check whether the resource has errors.
...
...
@@ -286,5 +286,13 @@ def empty_resource
def
empty_json_resource
"{}"
end
def
resource_errors
respond_to?
(
"
#{
format
}
_resource_errors"
)
?
send
(
"
#{
format
}
_resource_errors"
)
:
resource
.
errors
end
def
json_resource_errors
{
:errors
=>
resource
.
errors
}
end
end
end
actionpack/test/controller/mime_responds_test.rb
浏览文件 @
84c8b2fe
...
...
@@ -745,6 +745,20 @@ def test_using_resource_for_post_with_xml_yields_unprocessable_entity_on_failure
end
end
def
test_using_resource_for_post_with_json_yields_unprocessable_entity_on_failure
with_test_route_set
do
@request
.
accept
=
"application/json"
errors
=
{
:name
=>
:invalid
}
Customer
.
any_instance
.
stubs
(
:errors
).
returns
(
errors
)
post
:using_resource
assert_equal
"application/json"
,
@response
.
content_type
assert_equal
422
,
@response
.
status
errors
=
{
:errors
=>
errors
}
assert_equal
errors
.
to_json
,
@response
.
body
assert_nil
@response
.
location
end
end
def
test_using_resource_for_put_with_html_redirects_on_success
with_test_route_set
do
put
:using_resource
...
...
@@ -808,6 +822,18 @@ def test_using_resource_for_put_with_xml_yields_unprocessable_entity_on_failure
assert_nil
@response
.
location
end
def
test_using_resource_for_put_with_json_yields_unprocessable_entity_on_failure
@request
.
accept
=
"application/json"
errors
=
{
:name
=>
:invalid
}
Customer
.
any_instance
.
stubs
(
:errors
).
returns
(
errors
)
put
:using_resource
assert_equal
"application/json"
,
@response
.
content_type
assert_equal
422
,
@response
.
status
errors
=
{
:errors
=>
errors
}
assert_equal
errors
.
to_json
,
@response
.
body
assert_nil
@response
.
location
end
def
test_using_resource_for_delete_with_html_redirects_on_success
with_test_route_set
do
Customer
.
any_instance
.
stubs
(
:destroyed?
).
returns
(
true
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录