kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix faulty tests introduced in 8d0b4fa39

Browse source
This commit is contained in:
Michael Koziarski 2008-05-24 18:34:59 +12:00
parent 6cba97d2a4
commit 6277fd9113
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/test/cases/associations/has_one_associations_test.rb
View file

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

5
activerecord/test/cases/reflection_test.rb
View file

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

2
activerecord/test/models/company.rb
View file

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