diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-17 13:58:28 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-11-17 13:58:28 -0800 |
| commit | f60d00c56eb93d8a9ffb85a3af7e405f33ddf7f5 (patch) | |
| tree | d91d9cf8ce9382510b07d5099c93af1be9023891 /activerecord | |
| parent | ea76386493ff93b07d205fdb3f1aace000c59c0f (diff) | |
| parent | 8e3474bedeebc57903c258830be0dba559ffee9d (diff) | |
| download | rails-f60d00c56eb93d8a9ffb85a3af7e405f33ddf7f5.tar.gz rails-f60d00c56eb93d8a9ffb85a3af7e405f33ddf7f5.tar.bz2 rails-f60d00c56eb93d8a9ffb85a3af7e405f33ddf7f5.zip | |
Merge pull request #12929 from yahonda/test_merging_where_relations_add_order
Address test_merging_where_relations failure by adding order
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index 782c8bc1fd..9f9244f9b2 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -135,7 +135,7 @@ class MergingDifferentRelationsTest < ActiveRecord::TestCase test "merging where relations" do hello_by_bob = Post.where(body: "hello").joins(:author). - merge(Author.where(name: "Bob")).pluck("posts.id") + merge(Author.where(name: "Bob")).order("posts.id").pluck("posts.id") assert_equal [posts(:misc_by_bob).id, posts(:other_by_bob).id], hello_by_bob |