diff options
author | Philip Arndt <parndt@gmail.com> | 2012-07-02 14:21:05 +1200 |
---|---|---|
committer | Philip Arndt <parndt@gmail.com> | 2012-07-06 14:31:33 +1200 |
commit | a1ad02a4af213abfcd7c6602e6f2d281530c47cc (patch) | |
tree | 8c5fcaaaa9a7102b40789780a8f5e2a8f1b1eaa9 /activerecord | |
parent | 83302a4c1384c18bec7128ec561eb6a8aa674275 (diff) | |
download | rails-a1ad02a4af213abfcd7c6602e6f2d281530c47cc.tar.gz rails-a1ad02a4af213abfcd7c6602e6f2d281530c47cc.tar.bz2 rails-a1ad02a4af213abfcd7c6602e6f2d281530c47cc.zip |
Made ArgumentError messages consistent.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/nested_attributes.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/nested_attributes_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb index 841681e542..7febb5539f 100644 --- a/activerecord/lib/active_record/nested_attributes.rb +++ b/activerecord/lib/active_record/nested_attributes.rb @@ -351,7 +351,7 @@ module ActiveRecord if respond_to?(method) send(method, attributes.except(*unassignable_keys(assignment_opts)), assignment_opts) else - raise ArgumentError, "Cannot build association #{association_name}. Are you trying to build a polymorphic one-to-one association?" + raise ArgumentError, "Cannot build association `#{association_name}'. Are you trying to build a polymorphic one-to-one association?" end end end @@ -373,7 +373,7 @@ module ActiveRecord # }) # # Will update the name of the Person with ID 1, build a new associated - # person with the name `John', and mark the associated Person with ID 2 + # person with the name 'John', and mark the associated Person with ID 2 # for destruction. # # Also accepts an Array of attribute hashes: 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 |