1 files changed, 16 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 356a4a7a09..38e622f90f 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -410,4 +410,20 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     bulb = car.create_frickinawesome_bulb(:frickinawesome => false)
     assert_equal true, bulb.frickinawesome?
   end
+
+  def test_new_is_called_with_attributes_and_options
+    car = Car.create(:name => 'honda')
+
+    bulb = car.build_bulb
+    assert_equal Bulb, bulb.class
+
+    bulb = car.build_bulb
+    assert_equal Bulb, bulb.class
+
+    bulb = car.build_bulb(:bulb_type => :custom)
+    assert_equal Bulb, bulb.class
+
+    bulb = car.build_bulb({ :bulb_type => :custom }, :as => :admin)
+    assert_equal CustomBulb, bulb.class
+  end
 end