diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-14 08:23:20 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-14 08:23:20 +0900 |
commit | 5a4cd4fc6fbf1d3036172be5809d467a0395c567 (patch) | |
tree | 8f92865ada6b05e8012f5fe5710b3568ee7b462c /activerecord | |
parent | 6a4c02b850396b9d9e6f3ec8828b613459b71223 (diff) | |
parent | aaed081e08c1a04eabeec9fa5edab5e0760f46e2 (diff) | |
download | rails-5a4cd4fc6fbf1d3036172be5809d467a0395c567.tar.gz rails-5a4cd4fc6fbf1d3036172be5809d467a0395c567.tar.bz2 rails-5a4cd4fc6fbf1d3036172be5809d467a0395c567.zip |
Merge pull request #30596 from yahonda/address_test_or_with_bind_params_failure
Address random `test_or_with_bind_params` failures
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/test/cases/relation/or_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb index 955e9fc9ce..7e418f9c7d 100644 --- a/activerecord/test/cases/relation/or_test.rb +++ b/activerecord/test/cases/relation/or_test.rb @@ -31,7 +31,7 @@ module ActiveRecord end def test_or_with_bind_params - assert_equal Post.find([1, 2]), Post.where(id: 1).or(Post.where(id: 2)).to_a + assert_equal Post.find([1, 2]).sort_by(&:id), Post.where(id: 1).or(Post.where(id: 2)).sort_by(&:id) end def test_or_with_null_both |