aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-05 20:06:29 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-05 20:06:29 -0700
commit8ce61a366474b20368f60eb1c7bf31c3b7297873 (patch)
treeb25681e3b83dedf8858e3ccf9d53472d0f3eba61 /activerecord/test/cases
parenta5efd5800c1e93f0932c30e885c98de04cb00572 (diff)
parenta1ad02a4af213abfcd7c6602e6f2d281530c47cc (diff)
downloadrails-8ce61a366474b20368f60eb1c7bf31c3b7297873.tar.gz
rails-8ce61a366474b20368f60eb1c7bf31c3b7297873.tar.bz2
rails-8ce61a366474b20368f60eb1c7bf31c3b7297873.zip
Merge pull request #6927 from parndt/patch-3
Make ArgumentError message more consistent in nested attributes
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/nested_attributes_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 3daa033ed0..3a234f0cc1 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -196,7 +196,7 @@ class TestNestedAttributesOnAHasOneAssociation < ActiveRecord::TestCase
end
def test_should_raise_argument_error_if_trying_to_build_polymorphic_belongs_to
- assert_raise_with_message ArgumentError, "Cannot build association looter. Are you trying to build a polymorphic one-to-one association?" do
+ assert_raise_with_message ArgumentError, "Cannot build association `looter'. Are you trying to build a polymorphic one-to-one association?" do
Treasure.new(:name => 'pearl', :looter_attributes => {:catchphrase => "Arrr"})
end
end