aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-11-07 00:01:53 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-11-13 06:19:28 +0900
commit0ec967aa6655d62c92f72acb8d556a5b3f70762d (patch)
tree100e287492d9ebb44b47f9b6cec7aaca72209774 /activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
parentee7556cb08382f311bd40eec0e377aaa878c42e8 (diff)
downloadrails-0ec967aa6655d62c92f72acb8d556a5b3f70762d.tar.gz
rails-0ec967aa6655d62c92f72acb8d556a5b3f70762d.tar.bz2
rails-0ec967aa6655d62c92f72acb8d556a5b3f70762d.zip
Respect new records for `CollectionProxy#uniq`
Currently if `CollectionProxy` has more than one new record, `CollectionProxy#uniq` result is incorrect. And `CollectionProxy#uniq` was aliased to `distinct` in a1bb6c8b06db. But the `uniq` method and the `SELECT DISTINCT` method are different methods. The doc in `CollectionProxy` is for the `SELECT DISTINCT` method, not for the `uniq` method. Therefore, reverting the alias in `CollectionProxy` to fix the inconsistency and to have the both methods.
Diffstat (limited to 'activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb')
-rw-r--r--activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 4902792eee..4b7ac594cf 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -383,7 +383,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
dev.projects << projects(:active_record)
assert_equal 3, dev.projects.size
- assert_equal 1, dev.projects.distinct.size
+ assert_equal 1, dev.projects.uniq.size
end
def test_distinct_before_the_fact