diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-01 15:39:02 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-01 15:39:02 -0700 |
| commit | abad4f7049040f3b3f29b04f27f0a3fab3065060 (patch) | |
| tree | 7abf08f5faa8a0086218cf8e70986eb54c155033 /activerecord | |
| parent | 78defbb78ee6ddf804340a54eaad28f4e0ea723f (diff) | |
| parent | a605c441b9588930679888108ba134f01d617872 (diff) | |
| download | rails-abad4f7049040f3b3f29b04f27f0a3fab3065060.tar.gz rails-abad4f7049040f3b3f29b04f27f0a3fab3065060.tar.bz2 rails-abad4f7049040f3b3f29b04f27f0a3fab3065060.zip | |
Merge pull request #10036 from wangjohn/norecord_error_message_consistency_issues
Updated the error message for find to stay consistent across Rails
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/associations/inverse_associations_test.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 79e626f67e..2a00ac1386 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -83,7 +83,7 @@ module ActiveRecord find_by_scan(*args) elsif options[:inverse_of] args = args.flatten - raise RecordNotFound, "Must specify an id to find" if args.blank? + raise RecordNotFound, "Couldn't find #{scope.klass.name} without an ID" if args.blank? result = find_by_scan(*args) diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb index 89d2876c6c..85d0ad0aa1 100644 --- a/activerecord/test/cases/associations/inverse_associations_test.rb +++ b/activerecord/test/cases/associations/inverse_associations_test.rb @@ -305,7 +305,6 @@ class InverseHasManyTests < ActiveRecord::TestCase def test_raise_record_not_found_error_when_invalid_ids_are_passed man = Man.create! - interest = Interest.create!(man: man) invalid_id = 2394823094892348920348523452345 assert_raise(ActiveRecord::RecordNotFound) { man.interests.find(invalid_id) } @@ -316,7 +315,6 @@ class InverseHasManyTests < ActiveRecord::TestCase def test_raise_record_not_found_error_when_no_ids_are_passed man = Man.create! - interest = Interest.create!(man: man) assert_raise(ActiveRecord::RecordNotFound) { man.interests.find() } end |