diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 11:15:08 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-15 11:15:08 -0700 |
| commit | eb8807e84dff1b726051946bf09336f36aaae93e (patch) | |
| tree | c264f198a4e76f29609fd399efb08f56a86a729d /activerecord/test/cases/associations/inverse_associations_test.rb | |
| parent | befeeb2d0aef8db4ba84d1e2fa0d273f8a111363 (diff) | |
| parent | e3abd78ee58ee8564a69c989e963ae480b8acf9f (diff) | |
| download | rails-eb8807e84dff1b726051946bf09336f36aaae93e.tar.gz rails-eb8807e84dff1b726051946bf09336f36aaae93e.tar.bz2 rails-eb8807e84dff1b726051946bf09336f36aaae93e.zip | |
Merge branch '3-2-15' into 3-2-sec
* 3-2-15:
bumping to rc3
Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
bumping to rc2
Merge pull request #12443 from arthurnn/add_inverse_of_add_target
bumping version to 3.2.15.rc1
Fix STI scopes using benolee's suggestion. Fixes #11939
Diffstat (limited to 'activerecord/test/cases/associations/inverse_associations_test.rb')
| -rw-r--r-- | activerecord/test/cases/associations/inverse_associations_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb index 51e466ecac..0cab6faa25 100644 --- a/activerecord/test/cases/associations/inverse_associations_test.rb +++ b/activerecord/test/cases/associations/inverse_associations_test.rb @@ -125,10 +125,8 @@ class InverseHasOneTests < ActiveRecord::TestCase end def test_parent_instance_should_be_shared_with_newly_created_child - m = Man.create + m = Man.find(:first) f = m.create_face(:description => 'haunted') - - assert_equal m.object_id, f.man.object_id assert_not_nil f.man assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance" m.name = 'Bongo' |