aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-08-10 19:46:23 +0930
committerGitHub <noreply@github.com>2017-08-10 19:46:23 +0930
commit0e109b18887403c4285cba70e3b4d38903393464 (patch)
tree2136b1e20cb8e16cebbc932dea49243d5e59c9bb /activerecord/test
parent6c7a29729aa78853d9c8fb5315e5a05207ec1447 (diff)
parent93c65ae4efd62933618193c088ed1dadef47793d (diff)
downloadrails-0e109b18887403c4285cba70e3b4d38903393464.tar.gz
rails-0e109b18887403c4285cba70e3b4d38903393464.tar.bz2
rails-0e109b18887403c4285cba70e3b4d38903393464.zip
Merge pull request #30152 from bogdanvlviv/fix_random_ci_failure
Fix random CI failure due to non-deterministic sorting order
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/associations/join_model_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 2f68bc5141..9d3d5353ff 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -404,7 +404,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
end
def test_has_many_through_polymorphic_has_one
- assert_equal Tagging.find(1, 2).sort_by(&:id), authors(:david).taggings_2
+ assert_equal Tagging.find(1, 2).sort_by(&:id), authors(:david).taggings_2.sort_by(&:id)
end
def test_has_many_through_polymorphic_has_many