3 files changed, 24 insertions, 6 deletions
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 8ae9e5630c..48c618b2c1 100755
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -526,16 +526,27 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   end
   
   def test_has_one_through_eager_loading
-    members = Member.find(:all, :include => :club)
-    assert_equal 2, members.size
+    members = Member.find(:all, :include => :club, :conditions => ["name = ?", "Groucho Marx"])
+    assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].club}
   end
   
   def test_has_one_through_eager_loading_through_polymorphic
-    members = Member.find(:all, :include => :sponsor_club)
-    assert_equal 2, members.size
+    members = Member.find(:all, :include => :sponsor_club, :conditions => ["name = ?", "Groucho Marx"])
+    assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].sponsor_club}    
   end
+
+  def test_has_one_through_polymorphic_with_source_type
+    assert_equal members(:groucho), clubs(:moustache_club).sponsored_member
+  end
+
+  def test_eager_has_one_through_polymorphic_with_source_type
+    clubs = Club.find(:all, :include => :sponsored_member, :conditions => ["name = ?","Moustache and Eyebrow Fancier Club"])
+    # Only the eyebrow fanciers club has a sponsored_member
+    assert_not_nil assert_no_queries {clubs[0].sponsored_member}
+  end
+
 end
 
 class HasManyAssociationsTest < ActiveRecord::TestCase
diff --git a/activerecord/test/fixtures/sponsors.yml b/activerecord/test/fixtures/sponsors.yml
index c116df0534..42df8957d1 100644
--- a/activerecord/test/fixtures/sponsors.yml
+++ b/activerecord/test/fixtures/sponsors.yml
@@ -1,3 +1,9 @@
 moustache_club_sponsor_for_groucho:
   sponsor_club: moustache_club
-  sponsorable: groucho (Member)
-\ No newline at end of file
+  sponsorable: groucho (Member)
+boring_club_sponsor_for_groucho:
+  sponsor_club: boring_club
+  sponsorable: some_other_guy (Member)
+crazy_club_sponsor_for_groucho:
+  sponsor_club: crazy_club
+  sponsorable: some_other_guy (Member)
+\ No newline at end of file
diff --git a/activerecord/test/models/club.rb b/activerecord/test/models/club.rb
index 171445df3e..3ddb691dfb 100644
--- a/activerecord/test/models/club.rb
+++ b/activerecord/test/models/club.rb
@@ -2,5 +2,6 @@ class Club < ActiveRecord::Base
   has_many :memberships
   has_many :members, :through => :memberships
   has_many :current_memberships
-  has_many :sponsors
+  has_one :sponsor
+  has_one :sponsored_member, :through => :sponsor, :source => :sponsorable, :source_type => "Member"
 end
 \ No newline at end of file