Fix "in memory" where it should be "in-memory".

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 2ae9cb4888..532d4654b5 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 1e2093273e..ec1a6eda0c 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 = []