diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-01-02 14:28:53 +0000 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-03 16:24:31 -0800 |
| commit | a0be389d39b790e0625339251d2674b8250b16b1 (patch) | |
| tree | 256369916a5916d03d2b9e614582b0f7a9c35d74 /activerecord/test/cases/nested_attributes_test.rb | |
| parent | c47f802d0e7b0156512f197887d6e9bda6d0f269 (diff) | |
| download | rails-a0be389d39b790e0625339251d2674b8250b16b1.tar.gz rails-a0be389d39b790e0625339251d2674b8250b16b1.tar.bz2 rails-a0be389d39b790e0625339251d2674b8250b16b1.zip | |
Allow assignment on has_one :through where the owner is a new record [#5137 state:resolved]
This required changing the code to keep the association proxy for a belongs_to around, despite its target being nil. Which in turn required various changes to the way that stale target checking is handled, in order to support various edge cases (loaded target is nil then foreign key added, foreign key is changed and then changed back, etc). A side effect is that the code is nicer and more succinct.
Note that I am removing test_no_unexpected_aliasing since that is basically checking that the proxy for a belongs_to *does* change, which is the exact opposite of the intention of this commit. Also adding various tests for various edge cases and related things.
Phew, long commit message!
Diffstat (limited to 'activerecord/test/cases/nested_attributes_test.rb')
| -rw-r--r-- | activerecord/test/cases/nested_attributes_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb index 7d9b1104cd..d290afc1dd 100644 --- a/activerecord/test/cases/nested_attributes_test.rb +++ b/activerecord/test/cases/nested_attributes_test.rb @@ -411,7 +411,6 @@ class TestNestedAttributesOnABelongsToAssociation < ActiveRecord::TestCase def test_should_modify_an_existing_record_if_there_is_a_matching_composite_id @pirate.stubs(:id).returns('ABC1X') - @ship.stubs(:pirate_id).returns(@pirate.id) # prevents pirate from being reloaded due to non-matching foreign key @ship.pirate_attributes = { :id => @pirate.id, :catchphrase => 'Arr' } assert_equal 'Arr', @ship.pirate.catchphrase |