1 files changed, 87 insertions, 2 deletions
diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index 2f98d3c646..a36b2c2506 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -95,7 +95,11 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
   end
 
   def test_mass_assigning_does_not_choke_on_nil
-    Firm.new.assign_attributes(nil)
+    assert_nil Firm.new.assign_attributes(nil)
+  end
+
+  def test_mass_assigning_does_not_choke_on_empty_hash
+    assert_nil Firm.new.assign_attributes({})
   end
 
   def test_assign_attributes_uses_default_role_when_no_role_is_provided
@@ -247,10 +251,69 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
       assert !Task.new.respond_to?("#{method}=")
     end
   end
+
+  test "ActiveRecord::Model.whitelist_attributes works for models which include Model" do
+    begin
+      prev, ActiveRecord::Model.whitelist_attributes = ActiveRecord::Model.whitelist_attributes, true
+
+      klass = Class.new { include ActiveRecord::Model }
+      assert_equal ActiveModel::MassAssignmentSecurity::WhiteList, klass.active_authorizers[:default].class
+      assert_equal [], klass.active_authorizers[:default].to_a
+    ensure
+      ActiveRecord::Model.whitelist_attributes = prev
+    end
+  end
+
+  test "ActiveRecord::Model.whitelist_attributes works for models which inherit Base" do
+    begin
+      prev, ActiveRecord::Model.whitelist_attributes = ActiveRecord::Model.whitelist_attributes, true
+
+      klass = Class.new(ActiveRecord::Base)
+      assert_equal ActiveModel::MassAssignmentSecurity::WhiteList, klass.active_authorizers[:default].class
+      assert_equal [], klass.active_authorizers[:default].to_a
+
+      klass.attr_accessible 'foo'
+      assert_equal ['foo'], Class.new(klass).active_authorizers[:default].to_a
+    ensure
+      ActiveRecord::Model.whitelist_attributes = prev
+    end
+  end
+
+  test "ActiveRecord::Model.mass_assignment_sanitizer works for models which include Model" do
+    begin
+      sanitizer = Object.new
+      prev, ActiveRecord::Model.mass_assignment_sanitizer = ActiveRecord::Model.mass_assignment_sanitizer, sanitizer
+
+      klass = Class.new { include ActiveRecord::Model }
+      assert_equal sanitizer, klass._mass_assignment_sanitizer
+
+      ActiveRecord::Model.mass_assignment_sanitizer = nil
+      klass = Class.new { include ActiveRecord::Model }
+      assert_not_nil klass._mass_assignment_sanitizer
+    ensure
+      ActiveRecord::Model.mass_assignment_sanitizer = prev
+    end
+  end
+
+  test "ActiveRecord::Model.mass_assignment_sanitizer works for models which inherit Base" do
+    begin
+      sanitizer = Object.new
+      prev, ActiveRecord::Model.mass_assignment_sanitizer = ActiveRecord::Model.mass_assignment_sanitizer, sanitizer
+
+      klass = Class.new(ActiveRecord::Base)
+      assert_equal sanitizer, klass._mass_assignment_sanitizer
+
+      sanitizer2 = Object.new
+      klass.mass_assignment_sanitizer = sanitizer2
+      assert_equal sanitizer2, Class.new(klass)._mass_assignment_sanitizer
+    ensure
+      ActiveRecord::Model.mass_assignment_sanitizer = prev
+    end
+  end
 end
 
 
-# This class should be deleted when we removed active_record_deprecated_finders as a
+# This class should be deleted when we remove activerecord-deprecated_finders as a
 # dependency.
 class MassAssignmentSecurityDeprecatedFindersTest < ActiveRecord::TestCase
   include MassAssignmentTestHelpers
@@ -878,4 +941,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