diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-17 04:42:01 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-17 04:42:01 -0200 |
| commit | 9b67cb3d394692aa7feb7510aab0871e557d3dd0 (patch) | |
| tree | 0899739e1ccd43fe618f3717dec8f893e9b7a0b6 /activerecord/test/cases | |
| parent | f6cceea4db8afdb5abf8a9036d8d64bc96aea865 (diff) | |
| parent | e254665ac0eea72bdc3997c5fda9d02300ed0717 (diff) | |
| download | rails-9b67cb3d394692aa7feb7510aab0871e557d3dd0.tar.gz rails-9b67cb3d394692aa7feb7510aab0871e557d3dd0.tar.bz2 rails-9b67cb3d394692aa7feb7510aab0871e557d3dd0.zip | |
Merge pull request #23727 from prathamesh-sonpatki/fix-error-message-for-or
Show proper error message when a non-relation object is passed to AR::Relation#or
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/relation/or_test.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb index 28a0862f91..ce8c5ca489 100644 --- a/activerecord/test/cases/relation/or_test.rb +++ b/activerecord/test/cases/relation/or_test.rb @@ -82,5 +82,11 @@ module ActiveRecord assert_equal p.loaded?, true assert_equal expected, p.or(Post.where('id = 2')).to_a end + + def test_or_with_non_relation_object_raises_error + assert_raises ArgumentError do + Post.where(id: [1, 2, 3]).or(title: 'Rails') + end + end end end |