Merge remote-tracking branch 'origin/master'

2 files changed, 14 insertions, 14 deletions

diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index 24552bcaf2..d679ad41aa 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -24,7 +24,7 @@ class ConversionTest < ActiveModel::TestCase
     assert_equal "1", Contact.new(:id => 1).to_param
   end
 
-  test "to_path default implementation returns a string giving a relative path" do
+  test "to_partial_path default implementation returns a string giving a relative path" do
     assert_equal "contacts/contact", Contact.new.to_partial_path
     assert_equal "helicopters/helicopter", Helicopter.new.to_partial_path,
       "ActiveModel::Conversion#to_partial_path caching should be class-specific"
diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serialization_test.rb
index 3b201a70f5..66b18d65e5 100644
--- a/activemodel/test/cases/serialization_test.rb
+++ b/activemodel/test/cases/serialization_test.rb
@@ -88,62 +88,62 @@ class SerializationTest < ActiveModel::TestCase
 
   def test_include_option_with_singular_association
     expected = {"name"=>"David", "gender"=>"male", "email"=>"david@example.com",
-                :address=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111}}
+                "address"=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111}}
     assert_equal expected, @user.serializable_hash(:include => :address)
   end
 
   def test_include_option_with_plural_association
     expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
     assert_equal expected, @user.serializable_hash(:include => :friends)
   end
 
   def test_include_option_with_empty_association
     @user.friends = []
-    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David", :friends=>[]}
+    expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David", "friends"=>[]}
     assert_equal expected, @user.serializable_hash(:include => :friends)
   end
 
   def test_multiple_includes
     expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                :address=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111},
-                :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                "address"=>{"street"=>"123 Lane", "city"=>"Springfield", "state"=>"CA", "zip"=>11111},
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
     assert_equal expected, @user.serializable_hash(:include => [:address, :friends])
   end
 
   def test_include_with_options
     expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                :address=>{"street"=>"123 Lane"}}
+                "address"=>{"street"=>"123 Lane"}}
     assert_equal expected, @user.serializable_hash(:include => {:address => {:only => "street"}})
   end
 
   def test_nested_include
     @user.friends.first.friends = [@user]
     expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male',
-                            :friends => [{"email"=>"david@example.com", "gender"=>"male", "name"=>"David"}]},
-                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female', :friends => []}]}
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male',
+                            "friends"=> [{"email"=>"david@example.com", "gender"=>"male", "name"=>"David"}]},
+                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female', "friends"=> []}]}
     assert_equal expected, @user.serializable_hash(:include => {:friends => {:include => :friends}})
   end
 
   def test_only_include
-    expected = {"name"=>"David", :friends => [{"name" => "Joe"}, {"name" => "Sue"}]}
+    expected = {"name"=>"David", "friends" => [{"name" => "Joe"}, {"name" => "Sue"}]}
     assert_equal expected, @user.serializable_hash(:only => :name, :include => {:friends => {:only => :name}})
   end
 
   def test_except_include
     expected = {"name"=>"David", "email"=>"david@example.com",
-                :friends => [{"name" => 'Joe', "email" => 'joe@example.com'},
+                "friends"=> [{"name" => 'Joe', "email" => 'joe@example.com'},
                              {"name" => "Sue", "email" => 'sue@example.com'}]}
     assert_equal expected, @user.serializable_hash(:except => :gender, :include => {:friends => {:except => :gender}})
   end
 
   def test_multiple_includes_with_options
     expected = {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
-                :address=>{"street"=>"123 Lane"},
-                :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                "address"=>{"street"=>"123 Lane"},
+                "friends"=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
     assert_equal expected, @user.serializable_hash(:include => [{:address => {:only => "street"}}, :friends])
   end