diff options
4 files changed, 12 insertions, 12 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 49d6c31c9a..04d0f755b6 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -112,19 +112,19 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase def test_building_the_belonging_object_with_implicit_sti_base_class account = Account.new company = account.build_firm - assert(company.kind_of?(Company), "Expected #{company.class} to be a Company") + assert_kind_of Company, company, "Expected #{company.class} to be a Company" end def test_building_the_belonging_object_with_explicit_sti_base_class account = Account.new company = account.build_firm(:type => "Company") - assert(company.kind_of?(Company), "Expected #{company.class} to be a Company") + assert_kind_of Company, company, "Expected #{company.class} to be a Company" end def test_building_the_belonging_object_with_sti_subclass account = Account.new company = account.build_firm(:type => "Firm") - assert(company.kind_of?(Firm), "Expected #{company.class} to be a Firm") + assert_kind_of Firm, company, "Expected #{company.class} to be a Firm" end def test_building_the_belonging_object_with_an_invalid_type diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index eee0cf03aa..d25aca760f 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -147,19 +147,19 @@ class HasManyAssociationsTest < ActiveRecord::TestCase def test_building_the_associated_object_with_implicit_sti_base_class firm = DependentFirm.new company = firm.companies.build - assert(company.kind_of?(Company), "Expected #{company.class} to be a Company") + assert_kind_of Company, company, "Expected #{company.class} to be a Company" end def test_building_the_associated_object_with_explicit_sti_base_class firm = DependentFirm.new company = firm.companies.build(:type => "Company") - assert(company.kind_of?(Company), "Expected #{company.class} to be a Company") + assert_kind_of Company, company, "Expected #{company.class} to be a Company" end def test_building_the_associated_object_with_sti_subclass firm = DependentFirm.new company = firm.companies.build(:type => "Client") - assert(company.kind_of?(Client), "Expected #{company.class} to be a Client") + assert_kind_of Client, company, "Expected #{company.class} to be a Client" end def test_building_the_associated_object_with_an_invalid_type diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb index 5c4f6bbb32..4ed09a3bf7 100644 --- a/activerecord/test/cases/associations/has_one_associations_test.rb +++ b/activerecord/test/cases/associations/has_one_associations_test.rb @@ -217,19 +217,19 @@ class HasOneAssociationsTest < ActiveRecord::TestCase def test_building_the_associated_object_with_implicit_sti_base_class firm = DependentFirm.new company = firm.build_company - assert(company.kind_of?(Company), "Expected #{company.class} to be a Company") + assert_kind_of Company, company, "Expected #{company.class} to be a Company" end def test_building_the_associated_object_with_explicit_sti_base_class firm = DependentFirm.new company = firm.build_company(:type => "Company") - assert(company.kind_of?(Company), "Expected #{company.class} to be a Company") + assert_kind_of Company, company, "Expected #{company.class} to be a Company" end def test_building_the_associated_object_with_sti_subclass firm = DependentFirm.new company = firm.build_company(:type => "Client") - assert(company.kind_of?(Client), "Expected #{company.class} to be a Client") + assert_kind_of Client, company, "Expected #{company.class} to be a Client" end def test_building_the_associated_object_with_an_invalid_type diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index 2466a764f6..189066eb41 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -158,17 +158,17 @@ class InheritanceTest < ActiveRecord::TestCase def test_inheritance_new_with_default_class company = Company.new - assert_equal company.class, Company + assert_equal Company, company.class end def test_inheritance_new_with_base_class company = Company.new(:type => 'Company') - assert_equal company.class, Company + assert_equal Company, company.class end def test_inheritance_new_with_subclass firm = Company.new(:type => 'Firm') - assert_equal firm.class, Firm + assert_equal Firm, firm.class end def test_new_with_invalid_type |