diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-05-29 21:36:14 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-29 21:36:14 +0930 |
| commit | 0b04f37b3929054ba2ce7ffd72de584d03fdeab7 (patch) | |
| tree | 35b152851564873040656353ae08745ac2bd4aa0 /activerecord | |
| parent | 75500476eb7e953a06cc64e67ecc57b13ef8cc99 (diff) | |
| parent | e49b7dea48e3c5011c8a5cd0256e96251e5798f0 (diff) | |
| download | rails-0b04f37b3929054ba2ce7ffd72de584d03fdeab7.tar.gz rails-0b04f37b3929054ba2ce7ffd72de584d03fdeab7.tar.bz2 rails-0b04f37b3929054ba2ce7ffd72de584d03fdeab7.zip | |
Merge pull request #29265 from koic/remove_redundant_test_assertion
Remove a redundant test assertion
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 36238dd088..4271a09c9b 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1094,12 +1094,6 @@ class EagerAssociationTest < ActiveRecord::TestCase assert_equal authors(:david), assert_no_queries { posts[0].author } posts = assert_queries(2) do - Post.all.merge!(select: "distinct posts.*", includes: :author, joins: [:comments], where: "comments.body like 'Thank you%'", order: "posts.id").to_a - end - assert_equal [posts(:welcome)], posts - assert_equal authors(:david), assert_no_queries { posts[0].author } - - posts = assert_queries(2) do Post.all.merge!(includes: :author, joins: { taggings: :tag }, where: "tags.name = 'General'", order: "posts.id").to_a end assert_equal posts(:welcome, :thinking), posts |