diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-10-20 16:11:59 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-11-19 19:08:56 -0300 |
| commit | 93daf1b80984eab80f0da13c2b42ae76b63085e3 (patch) | |
| tree | 115da5500d0ed24ebffb4b40abaa7beeb517daf1 /activerecord/test/cases/autosave_association_test.rb | |
| parent | 69b627ef670b1dc7fee0b5d25903cebdeed49576 (diff) | |
| download | rails-93daf1b80984eab80f0da13c2b42ae76b63085e3.tar.gz rails-93daf1b80984eab80f0da13c2b42ae76b63085e3.tar.bz2 rails-93daf1b80984eab80f0da13c2b42ae76b63085e3.zip | |
Revert "IdentityMap - Adjustments to test cases"
This reverts commit 4db9dca55e3acc2c59f252eb83ecb83db5f4b81b.
Conflicts:
activerecord/test/cases/identity_map_test.rb
Diffstat (limited to 'activerecord/test/cases/autosave_association_test.rb')
| -rw-r--r-- | activerecord/test/cases/autosave_association_test.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb index 59fc13fe51..b13cb2d7a2 100644 --- a/activerecord/test/cases/autosave_association_test.rb +++ b/activerecord/test/cases/autosave_association_test.rb @@ -578,7 +578,7 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase @pirate.ship.mark_for_destruction assert !@pirate.reload.marked_for_destruction? - assert !@pirate.ship.target.reload.marked_for_destruction? + assert !@pirate.ship.marked_for_destruction? end # has_one @@ -1194,7 +1194,6 @@ class TestAutosaveAssociationValidationsOnAHasOneAssociation < ActiveRecord::Tes self.use_transactional_fixtures = false def setup - ActiveRecord::IdentityMap.enabled = false # This tests use trick with double association, IM prevents that, so we disable it. @pirate = Pirate.create(:catchphrase => "Don' botharrr talkin' like one, savvy?") @pirate.create_ship(:name => 'titanic') end @@ -1210,10 +1209,6 @@ class TestAutosaveAssociationValidationsOnAHasOneAssociation < ActiveRecord::Tes @pirate.non_validated_ship.name = '' assert @pirate.valid? end - - def teardown - ActiveRecord::IdentityMap.enabled = true - end end class TestAutosaveAssociationValidationsOnABelongsToAssociation < ActiveRecord::TestCase |