diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-17 00:43:53 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-17 00:43:53 +0000 |
| commit | d38417fc02bc12f1182c0821eda6b58ef3b8ca5a (patch) | |
| tree | d0977d6d00a00790412c699467b841d33473def1 /actionpack/test/controller/rescue_test.rb | |
| parent | b0a1aa7e7e4bc1b0a714fd143cc91944e2f4d230 (diff) | |
| download | rails-d38417fc02bc12f1182c0821eda6b58ef3b8ca5a.tar.gz rails-d38417fc02bc12f1182c0821eda6b58ef3b8ca5a.tar.bz2 rails-d38417fc02bc12f1182c0821eda6b58ef3b8ca5a.zip | |
RecordInvalid, RecordNotSaved => 422 Unprocessable Entity, StaleObjectError => 409 Conflict. References #7097.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5966 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/rescue_test.rb')
| -rw-r--r-- | actionpack/test/controller/rescue_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb index aa4d851e8e..f539546a1a 100644 --- a/actionpack/test/controller/rescue_test.rb +++ b/actionpack/test/controller/rescue_test.rb @@ -141,7 +141,9 @@ class RescueTest < Test::Unit::TestCase assert_equal :not_found, responses[ActionController::RoutingError.name] assert_equal :not_found, responses[ActionController::UnknownAction.name] assert_equal :not_found, responses['ActiveRecord::RecordNotFound'] - assert_equal :bad_request, responses['ActiveRecord::RecordInvalid'] + assert_equal :conflict, responses['ActiveRecord::StaleObjectError'] + assert_equal :unprocessable_entity, responses['ActiveRecord::RecordInvalid'] + assert_equal :unprocessable_entity, responses['ActiveRecord::RecordNotSaved'] end def test_rescue_templates |