1 files changed, 107 insertions, 0 deletions
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index 5a8bff378a..a7dde2c433 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -2,6 +2,7 @@ require 'cases/helper'
 require 'models/contact'
 require 'models/sheep'
 require 'models/track_back'
+require 'models/blog_post'
 
 class NamingTest < ActiveModel::TestCase
   def setup
@@ -27,6 +28,90 @@ class NamingTest < ActiveModel::TestCase
   def test_partial_path
     assert_equal 'post/track_backs/track_back', @model_name.partial_path
   end
+
+  def test_human
+    assert_equal 'Track back', @model_name.human
+  end
+end
+
+class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
+  def setup
+    @model_name = ActiveModel::Name.new(Blog::Post, Blog)
+  end
+
+  def test_singular
+    assert_equal 'blog_post', @model_name.singular
+  end
+
+  def test_plural
+    assert_equal 'blog_posts', @model_name.plural
+  end
+
+  def test_element
+    assert_equal 'post', @model_name.element
+  end
+
+  def test_collection
+    assert_equal 'blog/posts', @model_name.collection
+  end
+
+  def test_partial_path
+    assert_equal 'blog/posts/post', @model_name.partial_path
+  end
+
+  def test_human
+    assert_equal 'Post', @model_name.human
+  end
+
+  def test_route_key
+    assert_equal 'posts', @model_name.route_key
+  end
+
+  def test_param_key
+    assert_equal 'post', @model_name.param_key
+  end
+
+  def test_recognizing_namespace
+    assert_equal 'Post', Blog::Post.model_name.instance_variable_get("@unnamespaced")
+  end
+end
+
+class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase
+  def setup
+    @model_name = ActiveModel::Name.new(Blog::Post)
+  end
+
+  def test_singular
+    assert_equal 'blog_post', @model_name.singular
+  end
+
+  def test_plural
+    assert_equal 'blog_posts', @model_name.plural
+  end
+
+  def test_element
+    assert_equal 'post', @model_name.element
+  end
+
+  def test_collection
+    assert_equal 'blog/posts', @model_name.collection
+  end
+
+  def test_partial_path
+    assert_equal 'blog/posts/post', @model_name.partial_path
+  end
+
+  def test_human
+    assert_equal 'Post', @model_name.human
+  end
+
+  def test_route_key
+    assert_equal 'blog_posts', @model_name.route_key
+  end
+
+  def test_param_key
+    assert_equal 'blog_post', @model_name.param_key
+  end
 end
 
 class NamingHelpersTest < Test::Unit::TestCase
@@ -36,6 +121,12 @@ class NamingHelpersTest < Test::Unit::TestCase
     @singular = 'contact'
     @plural = 'contacts'
     @uncountable = Sheep
+    @route_key = 'contacts'
+    @param_key = 'contact'
+  end
+
+  def test_to_model_called_on_record
+    assert_equal 'post_named_track_backs', plural(Post::TrackBack.new)
   end
 
   def test_singular
@@ -54,6 +145,22 @@ class NamingHelpersTest < Test::Unit::TestCase
     assert_equal @plural, plural(@klass)
   end
 
+  def test_route_key
+    assert_equal @route_key, route_key(@record)
+  end
+
+  def test_route_key_for_class
+    assert_equal @route_key, route_key(@klass)
+  end
+
+  def test_param_key
+    assert_equal @param_key, param_key(@record)
+  end
+
+  def test_param_key_for_class
+    assert_equal @param_key, param_key(@klass)
+  end
+
   def test_uncountable
     assert uncountable?(@uncountable), "Expected 'sheep' to be uncoutable"
     assert !uncountable?(@klass), "Expected 'contact' to be countable"