aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/has_one_associations_test.rb
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2010-05-18 21:47:24 -0400
committerJosé Valim <jose.valim@gmail.com>2010-05-19 10:18:36 +0200
commitb4629528866446aa59f663a1162edbdacee85600 (patch)
treed68a0f440d552285adf99b462b8bde39d346aaa6 /activerecord/test/cases/associations/has_one_associations_test.rb
parentb753b4a076d7067efccbd1ad384829f77e62a064 (diff)
downloadrails-b4629528866446aa59f663a1162edbdacee85600.tar.gz
rails-b4629528866446aa59f663a1162edbdacee85600.tar.bz2
rails-b4629528866446aa59f663a1162edbdacee85600.zip
Use better assertion methods for testing
[#4645 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/test/cases/associations/has_one_associations_test.rb')
-rw-r--r--activerecord/test/cases/associations/has_one_associations_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 8f5540950e..469a21b9bf 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -149,7 +149,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
num_accounts = Account.count
firm = Firm.find(1)
- assert !firm.account.nil?
+ assert_not_nil firm.account
account_id = firm.account.id
assert_equal [], Account.destroyed_account_ids[firm.id]
@@ -162,7 +162,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
num_accounts = Account.count
firm = ExclusivelyDependentFirm.find(9)
- assert !firm.account.nil?
+ assert_not_nil firm.account
account_id = firm.account.id
assert_equal [], Account.destroyed_account_ids[firm.id]
@@ -181,7 +181,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
firm = RestrictedFirm.new(:name => 'restrict')
firm.save!
account = firm.create_account(:credit_limit => 10)
- assert !firm.account.nil?
+ assert_not_nil firm.account
assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
end
@@ -246,7 +246,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
def test_dependence_with_missing_association
Account.destroy_all
firm = Firm.find(1)
- assert firm.account.nil?
+ assert_nil firm.account
firm.destroy
end