aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/test/cases/associations')
-rw-r--r--activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb2
-rw-r--r--activerecord/test/cases/associations/nested_has_many_through_associations_test.rb13
2 files changed, 10 insertions, 5 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 e67cbcc1a8..c6777d0cb3 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
@@ -719,7 +719,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
def test_find_scoped_grouped
assert_equal 5, categories(:general).posts_grouped_by_title.size
- assert_equal 2, categories(:technology).posts_grouped_by_title.size
+ assert_equal 1, categories(:technology).posts_grouped_by_title.size
end
def test_find_scoped_grouped_having
diff --git a/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb b/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb
index 835a573978..964112b006 100644
--- a/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb
@@ -159,10 +159,15 @@ class NestedHasManyThroughAssociationsTest < ActiveRecord::TestCase
# has_many through
# Source: has_and_belongs_to_many
# Through: has_many
- # TODO: Enable and implement this, and finish off the test
- # def test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection
- # assert_equal [categories(:general), categories(:technology)], authors(:bob).post_categories
- # end
+ def test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection
+ assert_equal [categories(:general), categories(:cooking)], authors(:bob).post_categories
+
+ authors = Author.joins(:post_categories).where('categories.id' => categories(:cooking).id)
+ assert_equal [authors(:bob)], authors
+
+ authors = Author.includes(:post_categories)
+ assert_equal [categories(:general), categories(:cooking)], authors[2].post_categories
+ end
# TODO: has_many through
# Source: has_many