diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-17 00:46:32 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-17 00:46:32 +0000 |
| commit | e00e6a29410e4ae75abc0480a4d79d07b29008a8 (patch) | |
| tree | 4daed4701de72e45da4dfb431eeef120e764321a /activeresource/test | |
| parent | d38417fc02bc12f1182c0821eda6b58ef3b8ca5a (diff) | |
| download | rails-e00e6a29410e4ae75abc0480a4d79d07b29008a8.tar.gz rails-e00e6a29410e4ae75abc0480a4d79d07b29008a8.tar.bz2 rails-e00e6a29410e4ae75abc0480a4d79d07b29008a8.zip | |
Interpret 422 Unprocessable Entity as ResourceInvalid. Closes #7097.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5967 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activeresource/test')
| -rw-r--r-- | activeresource/test/base_errors_test.rb | 2 | ||||
| -rw-r--r-- | activeresource/test/connection_test.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activeresource/test/base_errors_test.rb b/activeresource/test/base_errors_test.rb index c6b840ebe1..3527eb2353 100644 --- a/activeresource/test/base_errors_test.rb +++ b/activeresource/test/base_errors_test.rb @@ -4,7 +4,7 @@ require "fixtures/person" class BaseErrorsTest < Test::Unit::TestCase def setup ActiveResource::HttpMock.respond_to do |mock| - mock.post "/people.xml", {}, "<?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>", 400 + mock.post "/people.xml", {}, "<?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 end @person = Person.new(:name => '', :age => '') assert_equal @person.save, false diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb index 99f0b8de89..8fcbf089de 100644 --- a/activeresource/test/connection_test.rb +++ b/activeresource/test/connection_test.rb @@ -36,12 +36,12 @@ class ConnectionTest < Test::Unit::TestCase # 404 is a missing resource. assert_response_raises ActiveResource::ResourceNotFound, 404 - # 400 is a validation error - assert_response_raises ActiveResource::ResourceInvalid, 400 - # 409 is an optimistic locking error assert_response_raises ActiveResource::ResourceConflict, 409 + # 422 is a validation error + assert_response_raises ActiveResource::ResourceInvalid, 422 + # 4xx are client errors. [401, 499].each do |code| assert_response_raises ActiveResource::ClientError, code |