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 1c06007d86920893c279fc76c67d30e1918b07de..805e9eac3777d1411a01f7dbb9aa75472a997389 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 b2f5fc4a7a448a6d655e9f71eb37fde4687c30cf..92038c76e5ce66d0e1a3d7738995a1bd40ae7bee 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 3d1c4e5f3d3f5b18a61111b73d4996165bf65170..f91f2ad2e93bd307446703d7511091c893616dbe 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