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.

2 files changed, 4 insertions, 0 deletions

diff --git a/activerecord/test/models/bulb.rb b/activerecord/test/models/bulb.rb
index c68d008c26..643dcefed3 100644
--- a/activerecord/test/models/bulb.rb
+++ b/activerecord/test/models/bulb.rb
@@ -2,6 +2,8 @@ class Bulb < ActiveRecord::Base
   default_scope where(:name => 'defaulty')
   belongs_to :car
 
+  attr_protected :car_id, :frickinawesome
+
   attr_reader :scope_after_initialize
 
   after_initialize :record_scope_after_initialize
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index b036f0f5c9..de1864345a 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -2,6 +2,8 @@ class Car < ActiveRecord::Base
 
   has_many :bulbs
   has_many :foo_bulbs, :class_name => "Bulb", :conditions => { :name => 'foo' }
+  has_many :frickinawesome_bulbs, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+
   has_many :tyres
   has_many :engines
   has_many :wheels, :as => :wheelable