diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 21:36:24 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 21:36:24 +0100 |
| commit | 06c787d2359660529ff5b927d3d34f22379eef00 (patch) | |
| tree | 2fcc97230e0ec2be6bca91465d75b6a434f2b6da /activerecord/test | |
| parent | dcd04e76179611a9db28c9e391aa7d6c2a5b046a (diff) | |
| download | rails-06c787d2359660529ff5b927d3d34f22379eef00.tar.gz rails-06c787d2359660529ff5b927d3d34f22379eef00.tar.bz2 rails-06c787d2359660529ff5b927d3d34f22379eef00.zip | |
Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_association_join_context_on_merge"
This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing
changes made to 58a49875df63729f07a9a81d1ee349087d258df5.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/relations_test.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 48fc82bbc7..3ef357e297 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -6,7 +6,6 @@ require 'models/topic' require 'models/comment' require 'models/author' require 'models/comment' -require 'models/rating' require 'models/entrant' require 'models/developer' require 'models/reply' @@ -20,7 +19,7 @@ require 'models/minivan' class RelationTest < ActiveRecord::TestCase fixtures :authors, :topics, :entrants, :developers, :companies, :developers_projects, :accounts, :categories, :categorizations, :posts, :comments, - :ratings, :tags, :taggings, :cars, :minivans + :tags, :taggings, :cars, :minivans def test_do_not_double_quote_string_id van = Minivan.last @@ -732,12 +731,6 @@ class RelationTest < ActiveRecord::TestCase assert_equal 1, comments.count end - def test_relation_merging_with_merged_joins - special_comments_with_ratings = SpecialComment.joins(:ratings) - posts_with_special_comments_with_ratings = Post.group("posts.id").joins(:special_comments).merge(special_comments_with_ratings) - assert_equal 1, authors(:david).posts.merge(posts_with_special_comments_with_ratings).to_a.length - end - def test_count posts = Post.scoped |