diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-05 22:58:48 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-05 22:58:48 +0000 |
| commit | 28ed10d3f27e27ed105dd8fd60d6151a6b372375 (patch) | |
| tree | ca2cfb5696cbc9de3d636212374eaeafafa23c39 /activerecord/test/cases/identity_map_test.rb | |
| parent | b7f1b3641afe0ff4f3cd344815c6f7bb58821e9e (diff) | |
| parent | 74818a35432b40fef16fe74f248ea75d35405324 (diff) | |
| download | rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.gz rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.bz2 rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
Diffstat (limited to 'activerecord/test/cases/identity_map_test.rb')
| -rw-r--r-- | activerecord/test/cases/identity_map_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb index d98638ab73..399d6c26df 100644 --- a/activerecord/test/cases/identity_map_test.rb +++ b/activerecord/test/cases/identity_map_test.rb @@ -295,7 +295,7 @@ class IdentityMapTest < ActiveRecord::TestCase end ############################################################################## - # Behaviour releated to saving failures + # Behaviour related to saving failures ############################################################################## def test_reload_object_if_save_failed @@ -338,7 +338,7 @@ class IdentityMapTest < ActiveRecord::TestCase end ############################################################################## - # Behaviour of readonly, forzen, destroyed + # Behaviour of readonly, frozen, destroyed ############################################################################## def test_find_using_identity_map_respects_readonly_when_loading_associated_object_first |