1 files changed, 37 insertions, 0 deletions
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index f31275163d..d033c1e760 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -4,6 +4,8 @@ require "models/ship"
 require "models/bird"
 require "models/parrot"
 require "models/treasure"
+require "models/man"
+require "models/interest"
 require 'active_support/hash_with_indifferent_access'
 
 module AssertRaiseWithMessage
@@ -470,6 +472,41 @@ module NestedAttributesOnACollectionAssociationTests
     assert Pirate.reflect_on_association(@association_name).options[:autosave]
   end
 
+  def test_validate_presence_of_parent__works_with_inverse_of
+    Man.accepts_nested_attributes_for(:interests)
+    assert_equal :man, Man.reflect_on_association(:interests).options[:inverse_of]
+    assert_equal :interests, Interest.reflect_on_association(:man).options[:inverse_of]
+
+    repair_validations(Interest) do
+      Interest.validates_presence_of(:man)
+      assert_difference 'Man.count' do
+        assert_difference 'Interest.count', 2 do
+          man = Man.create!(:name => 'John',
+                            :interests_attributes => [{:topic=>'Cars'}, {:topic=>'Sports'}])
+          assert_equal 2, man.interests.count
+        end
+      end
+    end
+  end
+
+  def test_validate_presence_of_parent__fails_without_inverse_of
+    Man.accepts_nested_attributes_for(:interests)
+    Man.reflect_on_association(:interests).options.delete(:inverse_of)
+    Interest.reflect_on_association(:man).options.delete(:inverse_of)
+
+    repair_validations(Interest) do
+      Interest.validates_presence_of(:man)
+      assert_no_difference ['Man.count', 'Interest.count'] do
+        man = Man.create(:name => 'John',
+                         :interests_attributes => [{:topic=>'Cars'}, {:topic=>'Sports'}])
+        assert !man.errors[:interests_man].empty?
+      end
+    end
+    # restore :inverse_of
+    Man.reflect_on_association(:interests).options[:inverse_of] = :man
+    Interest.reflect_on_association(:man).options[:inverse_of] = :interests
+  end
+
   private
 
   def association_setter