0
@@ -26,7 +26,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
0
 
0
   def test_with_select
0
     assert_equal Firm.find(1).account_with_select.attributes.size, 2
0
-    assert_equal Firm.find(1, :include => :account_with_select).attributes.size, 2
0
+    assert_equal Firm.find(1, :include => :account_with_select).account_with_select.attributes.size, 2
0
   end
0
 
0
   def test_can_marshal_has_one_association_with_nil_target

0
@@ -159,9 +159,10 @@ class ReflectionTest < ActiveRecord::TestCase
0
   end
0
 
0
   def test_reflection_of_all_associations
0
-    assert_equal 19, Firm.reflect_on_all_associations.size
0
+    # FIXME these assertions bust a lot
0
+    assert_equal 20, Firm.reflect_on_all_associations.size
0
     assert_equal 16, Firm.reflect_on_all_associations(:has_many).size
0
-    assert_equal 3, Firm.reflect_on_all_associations(:has_one).size
0
+    assert_equal 4, Firm.reflect_on_all_associations(:has_one).size
0
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
0
   end
0
 

0
@@ -47,7 +47,7 @@ class Firm < Company
0
   has_many :readonly_clients, :class_name => 'Client', :readonly => true
0
 
0
   has_one :account, :foreign_key => "firm_id", :dependent => :destroy
0
-  has_one :account_with_select, :foreign_key => "firm_id", :select => "id, firm_id"
0
+  has_one :account_with_select, :foreign_key => "firm_id", :select => "id, firm_id", :class_name=>'Account'
0
   has_one :readonly_account, :foreign_key => "firm_id", :class_name => "Account", :readonly => true
0
 end
0