aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2015-01-23 14:54:33 -0700
committerSean Griffin <sean@thoughtbot.com>2015-01-23 14:54:33 -0700
commit8c83bd0732fc526e69cd5c348cb9d9842ae60c99 (patch)
tree856a528211a5fd4ec579ac6b9ee830b87654f8f3 /activerecord/test/cases/associations
parent7c6f3938dee47f0932c2a1d4924adaebc25517ac (diff)
parenta225d4bec51778d99ccba5f0d6700dd00d2474f4 (diff)
downloadrails-8c83bd0732fc526e69cd5c348cb9d9842ae60c99.tar.gz
rails-8c83bd0732fc526e69cd5c348cb9d9842ae60c99.tar.bz2
rails-8c83bd0732fc526e69cd5c348cb9d9842ae60c99.zip
Merge pull request #10776 from bogdan/assign-attributes
Extracted attributes assingment from ActiveRecord to ActiveModel
Diffstat (limited to 'activerecord/test/cases/associations')
-rw-r--r--activerecord/test/cases/associations/has_one_associations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 9b6757e256..4df75adeb4 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -276,7 +276,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
def test_create_with_inexistent_foreign_key_failing
firm = Firm.create(name: 'GlobalMegaCorp')
- assert_raises(ActiveRecord::UnknownAttributeError) do
+ assert_raises(ActiveModel::AttributeAssignment::UnknownAttributeError) do
firm.create_account_with_inexistent_foreign_key
end
end