aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/join_model_test.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-11-17 14:55:19 -0500
committerGitHub <noreply@github.com>2016-11-17 14:55:19 -0500
commit07af54d43cba30be7c206c5783ae15ab2cf37aa3 (patch)
tree920354ffda3eab692e5a9efb333b67f43cca492f /activerecord/test/cases/associations/join_model_test.rb
parentf48bb1b4ad86bad71ae9c3e5dd3db6b4cb80e4d1 (diff)
parent0ec967aa6655d62c92f72acb8d556a5b3f70762d (diff)
downloadrails-07af54d43cba30be7c206c5783ae15ab2cf37aa3.tar.gz
rails-07af54d43cba30be7c206c5783ae15ab2cf37aa3.tar.bz2
rails-07af54d43cba30be7c206c5783ae15ab2cf37aa3.zip
Merge pull request #26980 from kamipo/respect_new_records_for_collection_proxy_distinct
Respect new records for `CollectionProxy#uniq`
Diffstat (limited to 'activerecord/test/cases/associations/join_model_test.rb')
-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 15446c6dc7..a4345f3857 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -413,7 +413,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
author = Author.includes(:taggings).find authors(:david).id
expected_taggings = taggings(:welcome_general, :thinking_general)
assert_no_queries do
- assert_equal expected_taggings, author.taggings.distinct.sort_by(&:id)
+ assert_equal expected_taggings, author.taggings.uniq.sort_by(&:id)
end
end