Add test to specify that attributes from an association's conditions should be assigned without mass-assignment protection when a record is built on the association.

1 files changed, 23 insertions, 4 deletions

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 5a414c49f1..b149f5912f 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -79,8 +79,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 'defaulty', bulb.name
   end
 
-  def test_create_from_association_set_owner_attributes_by_passing_protection
-    Bulb.attr_protected :car_id
+  def test_association_keys_bypass_attribute_protection
     car = Car.create(:name => 'honda')
 
     bulb = car.bulbs.new
@@ -100,8 +99,28 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
 
     bulb = car.bulbs.create :car_id => car.id + 1
     assert_equal car.id, bulb.car_id
-  ensure
-    Bulb.attr_protected :id
+  end
+
+  def test_association_conditions_bypass_attribute_protection
+    car = Car.create(:name => 'honda')
+
+    bulb = car.frickinawesome_bulbs.new
+    assert_equal true, bulb.frickinawesome?
+
+    bulb = car.frickinawesome_bulbs.new(:frickinawesome => false)
+    assert_equal true, bulb.frickinawesome?
+
+    bulb = car.frickinawesome_bulbs.build
+    assert_equal true, bulb.frickinawesome?
+
+    bulb = car.frickinawesome_bulbs.build(:frickinawesome => false)
+    assert_equal true, bulb.frickinawesome?
+
+    bulb = car.frickinawesome_bulbs.create
+    assert_equal true, bulb.frickinawesome?
+
+    bulb = car.frickinawesome_bulbs.create(:frickinawesome => false)
+    assert_equal true, bulb.frickinawesome?
   end
 
   # When creating objects on the association, we must not do it within a scope (even though it