aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-17 15:35:35 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-17 15:35:35 -0800
commitfb61fbd35229154f4ced124568697878822336cb (patch)
tree054fdbbbd4331844e5098f28f8017bc36d0f3782 /activerecord/test
parentf8877d4b2a2a6f68770b376f0b1391a6295f62f2 (diff)
downloadrails-fb61fbd35229154f4ced124568697878822336cb.tar.gz
rails-fb61fbd35229154f4ced124568697878822336cb.tar.bz2
rails-fb61fbd35229154f4ced124568697878822336cb.zip
Revert "Ensure Model#destroy respects optimistic locking"
[#1966 state:open] This reverts commit 0d922885fb54c19f04680482f024452859218910. Conflicts: activerecord/lib/active_record/locking/optimistic.rb
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/locking_test.rb18
1 files changed, 0 insertions, 18 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index f946e8699e..a64c01292f 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -38,24 +38,6 @@ class OptimisticLockingTest < ActiveRecord::TestCase
assert_raise(ActiveRecord::StaleObjectError) { p2.save! }
end
- def test_lock_destroy
- p1 = Person.find(1)
- p2 = Person.find(1)
- assert_equal 0, p1.lock_version
- assert_equal 0, p2.lock_version
-
- p1.first_name = 'stu'
- p1.save!
- assert_equal 1, p1.lock_version
- assert_equal 0, p2.lock_version
-
- assert_raises(ActiveRecord::StaleObjectError) { p2.destroy }
-
- assert p1.destroy
- assert_equal true, p1.frozen?
- assert_raises(ActiveRecord::RecordNotFound) { Person.find(1) }
- end
-
def test_lock_repeating
p1 = Person.find(1)
p2 = Person.find(1)