aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-29 00:18:27 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-29 00:18:43 -0300
commit18af5dab071bf21950ffe69b72b5fdecd6cf8165 (patch)
tree15e096f25e583840d3ac3252332d624a8e64b772
parent400c5fefcf6d3cca734b32fa6a9c93ce338602ea (diff)
downloadrails-18af5dab071bf21950ffe69b72b5fdecd6cf8165.tar.gz
rails-18af5dab071bf21950ffe69b72b5fdecd6cf8165.tar.bz2
rails-18af5dab071bf21950ffe69b72b5fdecd6cf8165.zip
Fix failing build related to change in CollectionAssociation#delete
Merge commit 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e
-rw-r--r--activerecord/test/cases/associations/join_model_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index ecc676f300..c2f8f1ca8c 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -578,7 +578,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
end
def test_deleting_junk_from_has_many_through_should_raise_type_mismatch
- assert_raise(ActiveRecord::AssociationTypeMismatch) { posts(:thinking).tags.delete("Uhh what now?") }
+ assert_raise(ActiveRecord::AssociationTypeMismatch) { posts(:thinking).tags.delete(Object.new) }
end
def test_has_many_through_sum_uses_calculations