aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/associations
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test/associations')
-rw-r--r--activerecord/test/associations/callbacks_test.rb2
-rw-r--r--activerecord/test/associations/join_model_test.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/associations/callbacks_test.rb b/activerecord/test/associations/callbacks_test.rb
index 4b6b7f4123..6df8718e28 100644
--- a/activerecord/test/associations/callbacks_test.rb
+++ b/activerecord/test/associations/callbacks_test.rb
@@ -128,7 +128,7 @@ class AssociationCallbacksTest < Test::Unit::TestCase
callback_log = ["before_adding<new>", "after_adding<new>"]
assert_equal callback_log, project.developers_log
assert project.save
- assert_equal 1, project.developers_with_callbacks.count
+ assert_equal 1, project.developers_with_callbacks.size
assert_equal callback_log, project.developers_log
end
diff --git a/activerecord/test/associations/join_model_test.rb b/activerecord/test/associations/join_model_test.rb
index aaef40ebf1..b970d054c4 100644
--- a/activerecord/test/associations/join_model_test.rb
+++ b/activerecord/test/associations/join_model_test.rb
@@ -304,7 +304,7 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
end
def test_unavailable_through_reflection
- assert_raises (ActiveRecord::HasManyThroughAssociationNotFoundError) { authors(:david).nothings }
+ assert_raise(ActiveRecord::HasManyThroughAssociationNotFoundError) { authors(:david).nothings }
end
def test_has_many_through_join_model_with_conditions
@@ -313,10 +313,10 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
end
def test_has_many_polymorphic
- assert_raises ActiveRecord::HasManyThroughAssociationPolymorphicError do
+ assert_raise ActiveRecord::HasManyThroughAssociationPolymorphicError do
assert_equal posts(:welcome, :thinking), tags(:general).taggables
end
- assert_raises ActiveRecord::EagerLoadPolymorphicError do
+ assert_raise ActiveRecord::EagerLoadPolymorphicError do
assert_equal posts(:welcome, :thinking), tags(:general).taggings.find(:all, :include => :taggable)
end
end