aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-05 09:24:47 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-05 09:24:47 -0800
commit07f187b7fe468ff7566f8365eb73339087b03c89 (patch)
tree0240f5f97dea74a5c119d427fd5b8f7837b6728b /activerecord
parentf4ef09c154fa1337c365541920d8f69604dc21b1 (diff)
parentca0718c164f667d12688294ae817997e53e65314 (diff)
downloadrails-07f187b7fe468ff7566f8365eb73339087b03c89.tar.gz
rails-07f187b7fe468ff7566f8365eb73339087b03c89.tar.bz2
rails-07f187b7fe468ff7566f8365eb73339087b03c89.zip
Merge pull request #4301 from Karunakar/refactor_tests
Refactor tests
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/locking_test.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 65cd9f9755..0c458d5318 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -230,10 +230,13 @@ class OptimisticLockingTest < ActiveRecord::TestCase
def test_polymorphic_destroy_with_dependencies_and_lock_version
car = Car.create!
- car.wheels << Wheel.create!
- assert_equal 1, car.wheels.count
- assert car.destroy
- assert_equal 0, car.wheels.count
+
+ assert_difference 'car.wheels.count' do
+ car.wheels << Wheel.create!
+ end
+ assert_difference 'car.wheels.count', -1 do
+ car.destroy
+ end
assert car.destroyed?
end
end