2 files changed, 42 insertions, 1 deletions
diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index 2f98d3c646..1b5421c25e 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -878,4 +878,26 @@ class MassAssignmentSecurityNestedAttributesTest < ActiveRecord::TestCase
     assert_all_attributes(person.best_friends.first)
   end
 
+  def test_mass_assignment_options_are_reset_after_exception
+    person = NestedPerson.create!({ :first_name => 'David', :gender => 'm' }, :as => :admin)
+    person.create_best_friend!({ :first_name => 'Jeremy', :gender => 'm' }, :as => :admin)
+
+    attributes = { :best_friend_attributes => { :comments => 'rides a sweet bike' } }
+    assert_raises(RuntimeError) { person.assign_attributes(attributes, :as => :admin) }
+    assert_equal 'm', person.best_friend.gender
+
+    person.best_friend_attributes = { :gender => 'f' }
+    assert_equal 'm', person.best_friend.gender
+  end
+
+  def test_mass_assignment_options_are_nested_correctly
+    person = NestedPerson.create!({ :first_name => 'David', :gender => 'm' }, :as => :admin)
+    person.create_best_friend!({ :first_name => 'Jeremy', :gender => 'm' }, :as => :admin)
+
+    attributes = { :best_friend_first_name => 'Josh', :best_friend_attributes => { :gender => 'f' } }
+    person.assign_attributes(attributes, :as => :admin)
+    assert_equal 'Josh', person.best_friend.first_name
+    assert_equal 'f', person.best_friend.gender
+  end
+
 end
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index d5c0b351aa..33cd6020a1 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -88,6 +88,25 @@ class TightDescendant < TightPerson; end
 
 class RichPerson < ActiveRecord::Base
   self.table_name = 'people'
-  
+
   has_and_belongs_to_many :treasures, :join_table => 'peoples_treasures'
 end
+
+class NestedPerson < ActiveRecord::Base
+  self.table_name = 'people'
+
+  attr_accessible :first_name, :best_friend_first_name, :best_friend_attributes
+  attr_accessible :first_name, :gender, :comments, :as => :admin
+  attr_accessible :best_friend_attributes, :best_friend_first_name, :as => :admin
+
+  has_one :best_friend, :class_name => 'NestedPerson', :foreign_key => :best_friend_id
+  accepts_nested_attributes_for :best_friend, :update_only => true
+
+  def comments=(new_comments)
+    raise RuntimeError
+  end
+
+  def best_friend_first_name=(new_name)
+    assign_attributes({ :best_friend_attributes => { :first_name => new_name } })
+  end
+end
+\ No newline at end of file