Merge pull request #3991 from akaspick/attrfix

Allow nested attributes in associations to update values in it's owner o...

2 files changed, 9 insertions, 1 deletions

diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 2ae9cb4888..2f28dd4767 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -617,6 +617,11 @@ module NestedAttributesOnACollectionAssociationTests
     assert_equal ['Grace OMalley', 'Privateers Greed'], [@child_1.name, @child_2.name]
   end
 
+  def test_should_take_a_hash_with_owner_attributes_and_assign_the_attributes_to_the_associated_model
+    @pirate.birds.create :name => 'bird', :pirate_attributes => {:id => @pirate.id.to_s, :catchphrase => 'Holla!'}
+    assert_equal 'Holla!', @pirate.reload.catchphrase
+  end
+
   def test_should_raise_RecordNotFound_if_an_id_is_given_but_doesnt_return_a_record
     assert_raise_with_message ActiveRecord::RecordNotFound, "Couldn't find #{@child_1.class.name} with ID=1234567890 for Pirate with ID=#{@pirate.id}" do
       @pirate.attributes = { association_getter => [{ :id => 1234567890 }] }
diff --git a/activerecord/test/models/bird.rb b/activerecord/test/models/bird.rb
index e61d48e6a5..dff099c1fb 100644
--- a/activerecord/test/models/bird.rb
+++ b/activerecord/test/models/bird.rb
@@ -1,9 +1,12 @@
 class Bird < ActiveRecord::Base
+  belongs_to :pirate
   validates_presence_of :name
 
+  accepts_nested_attributes_for :pirate
+
   attr_accessor :cancel_save_from_callback
   before_save :cancel_save_callback_method, :if => :cancel_save_from_callback
   def cancel_save_callback_method
     false
   end
-end
\ No newline at end of file
+end