diff options
| author | Denis Odorcic <denis.odorcic@jadedpixel.com> | 2011-09-16 11:04:12 -0400 |
|---|---|---|
| committer | Denis Odorcic <denis.odorcic@jadedpixel.com> | 2011-09-16 11:16:17 -0400 |
| commit | b09b2a8401c18d1efff21b3919ac280470a6eb8b (patch) | |
| tree | c07cf546770d1fbc3dbf8864d9a0888a3453ab50 /activeresource/test | |
| parent | d5bf12aca61a1c8673bbe04bde23b34d0e5aea39 (diff) | |
| download | rails-b09b2a8401c18d1efff21b3919ac280470a6eb8b.tar.gz rails-b09b2a8401c18d1efff21b3919ac280470a6eb8b.tar.bz2 rails-b09b2a8401c18d1efff21b3919ac280470a6eb8b.zip | |
Fix ActiveResource JSON error parser and incorrect tests
Diffstat (limited to 'activeresource/test')
| -rw-r--r-- | activeresource/test/cases/base_errors_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/test/cases/base_errors_test.rb b/activeresource/test/cases/base_errors_test.rb index 5063916d10..a1766cdb21 100644 --- a/activeresource/test/cases/base_errors_test.rb +++ b/activeresource/test/cases/base_errors_test.rb @@ -5,7 +5,7 @@ class BaseErrorsTest < Test::Unit::TestCase def setup ActiveResource::HttpMock.respond_to do |mock| mock.post "/people.xml", {}, %q(<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>), 422, {'Content-Type' => 'application/xml; charset=utf-8'} - mock.post "/people.json", {}, %q({"errors":["Age can't be blank","Name can't be blank","Name must start with a letter","Person quota full for today."]}), 422, {'Content-Type' => 'application/json; charset=utf-8'} + mock.post "/people.json", {}, %q({"errors":{"age":["can't be blank"],"name":["can't be blank", "must start with a letter"],"person":["quota full for today."]}}), 422, {'Content-Type' => 'application/json; charset=utf-8'} end end @@ -83,7 +83,7 @@ class BaseErrorsTest < Test::Unit::TestCase def test_should_mark_as_invalid_when_content_type_is_unavailable_in_response_header ActiveResource::HttpMock.respond_to do |mock| mock.post "/people.xml", {}, %q(<?xml version="1.0" encoding="UTF-8"?><errors><error>Age can't be blank</error><error>Name can't be blank</error><error>Name must start with a letter</error><error>Person quota full for today.</error></errors>), 422, {} - mock.post "/people.json", {}, %q({"errors":["Age can't be blank","Name can't be blank","Name must start with a letter","Person quota full for today."]}), 422, {} + mock.post "/people.json", {}, %q({"errors":{"age":["can't be blank"],"name":["can't be blank", "must start with a letter"],"person":["quota full for today."]}}), 422, {} end [ :json, :xml ].each do |format| |