1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index e7d1893ff3..f392366c19 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -66,7 +66,8 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
   def test_id_assignment
     apple = Firm.create("name" => "Apple")
     citibank = Account.create("credit_limit" => 10)
-    assert_raise(NoMethodError) { citibank.firm_id = apple }
+    citibank.firm_id = apple
+    assert_nil citibank.firm_id
   end
 
   def test_natural_assignment_with_primary_key
@@ -544,6 +545,11 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal new_firm.name, "Apple"
   end
 
+  def test_attributes_are_set_without_error_when_initialized_from_belongs_to_association_with_array_in_where_clause
+    new_account = Account.where(:credit_limit => [ 50, 60 ]).new
+    assert_nil new_account.credit_limit
+  end
+
   def test_reassigning_the_parent_id_updates_the_object
     client = companies(:second_client)