1 files changed, 20 insertions, 2 deletions
diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index d679ad41aa..800cad6d9a 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -13,7 +13,7 @@ class ConversionTest < ActiveModel::TestCase
   end
 
   test "to_key default implementation returns the id in an array for persisted records" do
-    assert_equal [1], Contact.new(:id => 1).to_key
+    assert_equal [1], Contact.new(id: 1).to_key
   end
 
   test "to_param default implementation returns nil for new records" do
@@ -21,7 +21,21 @@ class ConversionTest < ActiveModel::TestCase
   end
 
   test "to_param default implementation returns a string of ids for persisted records" do
-    assert_equal "1", Contact.new(:id => 1).to_param
+    assert_equal "1", Contact.new(id: 1).to_param
+  end
+
+  test "to_param returns the string joined by '-'" do
+    assert_equal "abc-xyz", Contact.new(id: ["abc", "xyz"]).to_param
+  end
+
+  test "to_param returns nil if to_key is nil" do
+    klass = Class.new(Contact) do
+      def persisted?
+        true
+      end
+    end
+
+    assert_nil klass.new.to_param
   end
 
   test "to_partial_path default implementation returns a string giving a relative path" do
@@ -29,4 +43,8 @@ class ConversionTest < ActiveModel::TestCase
     assert_equal "helicopters/helicopter", Helicopter.new.to_partial_path,
       "ActiveModel::Conversion#to_partial_path caching should be class-specific"
   end
+
+  test "to_partial_path handles namespaced models" do
+    assert_equal "helicopter/comanches/comanche", Helicopter::Comanche.new.to_partial_path
+  end
 end