diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-11 17:12:42 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-11-11 17:12:42 +0530 |
commit | 9fd0cd3a12f969ca0c5c7ce6163e9e451637506d (patch) | |
tree | a8bd9971ae8abb2146099b038200755ba1c2e029 /activerecord | |
parent | df5c9fd9f42e9bebb02bb61acf70de3d17bc8152 (diff) | |
download | rails-9fd0cd3a12f969ca0c5c7ce6163e9e451637506d.tar.gz rails-9fd0cd3a12f969ca0c5c7ce6163e9e451637506d.tar.bz2 rails-9fd0cd3a12f969ca0c5c7ce6163e9e451637506d.zip |
Revert "Fix "in memory" where it should be "in-memory"."
This reverts commit e34e4d43301618307f94123d3710f094297f91f3.
Reason: code changes are not allowed in docrails.
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/test/cases/nested_attributes_test.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/relation_scoping_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb index 532d4654b5..2ae9cb4888 100644 --- a/activerecord/test/cases/nested_attributes_test.rb +++ b/activerecord/test/cases/nested_attributes_test.rb @@ -937,13 +937,13 @@ class TestHasManyAutosaveAssociationWhichItselfHasAutosaveAssociations < ActiveR @trinket = @part.trinkets.create!(:name => "Necklace") end - test "if association is not loaded and association record is saved and then in-memory record attributes should be saved" do + test "if association is not loaded and association record is saved and then in memory record attributes should be saved" do @ship.parts_attributes=[{:id => @part.id,:name =>'Deck'}] assert_equal 1, @ship.association(:parts).target.size assert_equal 'Deck', @ship.parts[0].name end - test "if association is not loaded and child doesn't change and I am saving a grandchild then in-memory record should be used" do + test "if association is not loaded and child doesn't change and I am saving a grandchild then in memory record should be used" do @ship.parts_attributes=[{:id => @part.id,:trinkets_attributes =>[{:id => @trinket.id, :name => 'Ruby'}]}] assert_equal 1, @ship.association(:parts).target.size assert_equal 'Mast', @ship.parts[0].name diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb index ec1a6eda0c..1e2093273e 100644 --- a/activerecord/test/cases/relation_scoping_test.rb +++ b/activerecord/test/cases/relation_scoping_test.rb @@ -527,7 +527,7 @@ class DefaultScopingTest < ActiveRecord::TestCase def test_default_scope_is_threadsafe if in_memory_db? - skip "in-memory db can't share a db between threads" + skip "in memory db can't share a db between threads" end threads = [] |