From 2f6e33d3f84fe6924971291bbf9d0c345afe3f47 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 20 Jul 2012 19:35:02 +0100 Subject: [PATCH] rm unnecessary test interpolation is no longer a thing separate from "normal" assoc conditions. --- .../associations/has_many_through_associations_test.rb | 7 ------- activerecord/test/models/post.rb | 4 ---- activerecord/test/models/tagging.rb | 1 - 3 files changed, 12 deletions(-) diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb index 1c06007d86..805e9eac37 100644 --- a/activerecord/test/cases/associations/has_many_through_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb @@ -813,13 +813,6 @@ def test_deleting_from_has_many_through_a_belongs_to_should_not_try_to_update_co assert post[:author_count].nil? end - def test_interpolated_conditions - post = posts(:welcome) - assert !post.tags.empty? - assert_equal post.tags, post.interpolated_tags - assert_equal post.tags, post.interpolated_tags_2 - end - def test_primary_key_option_on_source post = posts(:welcome) category = categories(:general) diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb index b2f5fc4a7a..92038c76e5 100644 --- a/activerecord/test/models/post.rb +++ b/activerecord/test/models/post.rb @@ -70,10 +70,6 @@ def add_joins_and_select end end - has_many :interpolated_taggings, -> { where "1 = #{1}" }, :class_name => 'Tagging', :as => :taggable - has_many :interpolated_tags, :through => :taggings - has_many :interpolated_tags_2, :through => :interpolated_taggings, :source => :tag - has_many :taggings_with_delete_all, :class_name => 'Tagging', :as => :taggable, :dependent => :delete_all has_many :taggings_with_destroy, :class_name => 'Tagging', :as => :taggable, :dependent => :destroy diff --git a/activerecord/test/models/tagging.rb b/activerecord/test/models/tagging.rb index 3d1c4e5f3d..f91f2ad2e9 100644 --- a/activerecord/test/models/tagging.rb +++ b/activerecord/test/models/tagging.rb @@ -8,7 +8,6 @@ class Tagging < ActiveRecord::Base belongs_to :invalid_tag, :class_name => 'Tag', :foreign_key => 'tag_id' belongs_to :blue_tag, -> { where :tags => { :name => 'Blue' } }, :class_name => 'Tag', :foreign_key => :tag_id belongs_to :tag_with_primary_key, :class_name => 'Tag', :foreign_key => :tag_id, :primary_key => :custom_primary_key - belongs_to :interpolated_tag, -> { where "1 = #{1}" }, :class_name => 'Tag', :foreign_key => :tag_id belongs_to :taggable, :polymorphic => true, :counter_cache => true has_many :things, :through => :taggable end -- GitLab