diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-09 00:11:12 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-09-09 00:11:12 +0000 |
| commit | 0a84624bd78643f2161d162f68669de03fe2bac8 (patch) | |
| tree | 5f4f21f814a6be2db296fbad2fe7658d62f7c4f3 /activeresource/test | |
| parent | 2c6747f858481efa1bc3612e955861c13dc1c95b (diff) | |
| download | rails-0a84624bd78643f2161d162f68669de03fe2bac8.tar.gz rails-0a84624bd78643f2161d162f68669de03fe2bac8.tar.bz2 rails-0a84624bd78643f2161d162f68669de03fe2bac8.zip | |
Optimistic locking: raise ActiveResource::ResourceConflict on 409 Conflict response.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activeresource/test')
| -rw-r--r-- | activeresource/test/base_test.rb | 8 | ||||
| -rw-r--r-- | activeresource/test/connection_test.rb | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/activeresource/test/base_test.rb b/activeresource/test/base_test.rb index 97f2ea3d01..d8c654350b 100644 --- a/activeresource/test/base_test.rb +++ b/activeresource/test/base_test.rb @@ -133,6 +133,14 @@ class BaseTest < Test::Unit::TestCase addy.save end + def test_update_conflict + ActiveResource::HttpMock.respond_to do |mock| + mock.get "/people/2.xml", @david + mock.put "/people/2", nil, 409 + end + assert_raises(ActiveResource::ResourceConflict) { Person.find(2).save } + end + def test_destroy assert Person.find(1).destroy ActiveResource::HttpMock.respond_to do |mock| diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb index d72c1c612d..0744e327e6 100644 --- a/activeresource/test/connection_test.rb +++ b/activeresource/test/connection_test.rb @@ -20,6 +20,9 @@ class ConnectionTest < Test::Unit::TestCase # 400 is a validation error assert_response_raises ActiveResource::ResourceInvalid, 400 + # 409 is an optimistic locking error + assert_response_raises ActiveResource::ResourceConflict, 409 + # 4xx are client errors. [401, 499].each do |code| assert_response_raises ActiveResource::ClientError, code |