diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-01-16 19:20:37 +0000 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-16 13:43:53 -0800 |
commit | bf24fe810c0591619ac01cc88d8a40423895d9d7 (patch) | |
tree | 6d952e007713e5a7147a203b1648e3acb9f36c18 /activerecord/test | |
parent | 3ef693724c4719564361b3f48f8977b795c935e0 (diff) | |
download | rails-bf24fe810c0591619ac01cc88d8a40423895d9d7.tar.gz rails-bf24fe810c0591619ac01cc88d8a40423895d9d7.tar.bz2 rails-bf24fe810c0591619ac01cc88d8a40423895d9d7.zip |
belongs_to records should be initialized within the association scope
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 21 | ||||
-rw-r--r-- | activerecord/test/models/company.rb | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index ef6c482f67..01073bca3d 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -608,4 +608,25 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_equal groucho, sponsor.sponsorable assert_equal groucho, sponsor.thing end + + def test_build_with_conditions + client = companies(:second_client) + firm = client.build_bob_firm + + assert_equal "Bob", firm.name + end + + def test_create_with_conditions + client = companies(:second_client) + firm = client.create_bob_firm + + assert_equal "Bob", firm.name + end + + def test_create_bang_with_conditions + client = companies(:second_client) + firm = client.create_bob_firm! + + assert_equal "Bob", firm.name + end end diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index e8a126fb28..3e219fbe4a 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -123,6 +123,7 @@ class Client < Company belongs_to :firm_with_primary_key, :class_name => "Firm", :primary_key => "name", :foreign_key => "firm_name" belongs_to :firm_with_primary_key_symbols, :class_name => "Firm", :primary_key => :name, :foreign_key => :firm_name belongs_to :readonly_firm, :class_name => "Firm", :foreign_key => "firm_id", :readonly => true + belongs_to :bob_firm, :class_name => "Firm", :foreign_key => "client_of", :conditions => { :name => "Bob" } has_many :accounts, :through => :firm belongs_to :account |