From 0fac4559e1ccbdba1be8a4457dc666b3e560de94 Mon Sep 17 00:00:00 2001 From: Marla Brizel Zeschin Date: Mon, 20 Apr 2020 10:09:03 -0600 Subject: [PATCH] Update ActiveRecord::OrTest#test_or_when_grouping (#38978) Co-authored-by: Ryuta Kamizono --- activerecord/test/cases/relation/or_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb index 95375eb4ee..0f42464d18 100644 --- a/activerecord/test/cases/relation/or_test.rb +++ b/activerecord/test/cases/relation/or_test.rb @@ -95,9 +95,9 @@ def test_or_with_incompatible_unscope end def test_or_when_grouping - groups = Post.where("id < 10").group("body").select("body, COUNT(*) AS c") - expected = groups.having("COUNT(*) > 1 OR body like 'Such%'").to_a.map { |o| [o.body, o.c] } - assert_equal expected, groups.having("COUNT(*) > 1").or(groups.having("body like 'Such%'")).to_a.map { |o| [o.body, o.c] } + groups = Post.where("id < 10").group("body") + expected = groups.having("COUNT(*) > 1 OR body like 'Such%'").count + assert_equal expected, groups.having("COUNT(*) > 1").or(groups.having("body like 'Such%'")).count end def test_or_with_named_scope -- GitLab