Merge branch 'master' of git://github.com/rails/rails

2 files changed, 27 insertions, 13 deletions

diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 59985374d3..5f13b66d11 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -180,27 +180,41 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_associate_with_create_and_invalid_options
-    peeps = companies(:first_firm).developers.count
-    assert_nothing_raised { companies(:first_firm).developers.create(:name => '0') }
-    assert_equal peeps, companies(:first_firm).developers.count
+    firm = companies(:first_firm)
+    assert_no_difference('firm.developers.count') { assert_nothing_raised { firm.developers.create(:name => '0') } }
   end
 
   def test_associate_with_create_and_valid_options
-    peeps = companies(:first_firm).developers.count
-    assert_nothing_raised { companies(:first_firm).developers.create(:name => 'developer') }
-    assert_equal peeps + 1, companies(:first_firm).developers.count
+    firm = companies(:first_firm)
+    assert_difference('firm.developers.count', 1) { firm.developers.create(:name => 'developer') }
   end
 
   def test_associate_with_create_bang_and_invalid_options
-    peeps = companies(:first_firm).developers.count
-    assert_raises(ActiveRecord::RecordInvalid) { companies(:first_firm).developers.create!(:name => '0') }
-    assert_equal peeps, companies(:first_firm).developers.count
+    firm = companies(:first_firm)
+    assert_no_difference('firm.developers.count') { assert_raises(ActiveRecord::RecordInvalid) { firm.developers.create!(:name => '0') } }
   end
 
   def test_associate_with_create_bang_and_valid_options
-    peeps = companies(:first_firm).developers.count
-    assert_nothing_raised { companies(:first_firm).developers.create!(:name => 'developer') }
-    assert_equal peeps + 1, companies(:first_firm).developers.count
+    firm = companies(:first_firm)
+    assert_difference('firm.developers.count', 1) { firm.developers.create!(:name => 'developer') }
+  end
+
+  def test_push_with_invalid_record
+    firm = companies(:first_firm)
+    assert_raises(ActiveRecord::RecordInvalid) { firm.developers << Developer.new(:name => '0') }
+  end
+
+  def test_push_with_invalid_join_record
+    repair_validations(Contract) do
+      Contract.validate {|r| r.errors[:base] << 'Invalid Contract' }
+
+      firm = companies(:first_firm)
+      lifo = Developer.new(:name => 'lifo')
+      assert_raises(ActiveRecord::RecordInvalid) { firm.developers << lifo }
+
+      lifo = Developer.create!(:name => 'lifo')
+      assert_raises(ActiveRecord::RecordInvalid) { firm.developers << lifo }
+    end
   end
 
   def test_clear_associations
diff --git a/activerecord/test/cases/validations/uniqueness_validation_test.rb b/activerecord/test/cases/validations/uniqueness_validation_test.rb
index cb123d3498..17ba4e2f8a 100644
--- a/activerecord/test/cases/validations/uniqueness_validation_test.rb
+++ b/activerecord/test/cases/validations/uniqueness_validation_test.rb
@@ -59,7 +59,7 @@ class UniquenessValidationTest < ActiveRecord::TestCase
     assert t2.save, "Should now save t2 as unique"
   end
 
-  def test_validates_uniquness_with_newline_chars
+  def test_validates_uniqueness_with_newline_chars
     Topic.validates_uniqueness_of(:title, :case_sensitive => false)
 
     t = Topic.new("title" => "new\nline")