aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-08-08 17:33:45 -0400
committerGitHub <noreply@github.com>2017-08-08 17:33:45 -0400
commit7e64d6d2aacc4c742fa0054d5640858f04539836 (patch)
treeaa2f067a559cc0979e7ffa24759db33e881e57f2
parent507f3efe1f03488fd19b314f89dfafa5626d6eb5 (diff)
parent75cfb3dbdbb520147a532bd92ad6111c0e2ebf88 (diff)
downloadrails-7e64d6d2aacc4c742fa0054d5640858f04539836.tar.gz
rails-7e64d6d2aacc4c742fa0054d5640858f04539836.tar.bz2
rails-7e64d6d2aacc4c742fa0054d5640858f04539836.zip
Merge pull request #30133 from kamipo/fix_random_ci_failure
Fix random CI failure due to non-deterministic sorting order
-rw-r--r--activerecord/test/cases/associations/has_many_through_associations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 5797ffef38..c5e35a146b 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -817,7 +817,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
sarah = Person.create!(first_name: "Sarah", primary_contact_id: people(:susan).id, gender: "F", number1_fan_id: 1)
john = Person.create!(first_name: "John", primary_contact_id: sarah.id, gender: "M", number1_fan_id: 1)
assert_equal sarah.agents, [john]
- assert_equal people(:susan).agents.flat_map(&:agents), people(:susan).agents_of_agents
+ assert_equal people(:susan).agents.flat_map(&:agents).sort, people(:susan).agents_of_agents.sort
end
def test_associate_existing_with_nonstandard_primary_key_on_belongs_to