4 files changed, 52 insertions, 9 deletions
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index 5f943729dd..e8db73ba52 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -74,10 +74,6 @@ class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
   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
@@ -160,6 +156,40 @@ class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
   end
 end
 
+class NamingUsingRelativeModelNameTest < ActiveModel::TestCase
+  def setup
+    @model_name = Blog::Post.model_name
+  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_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
+end
+
 class NamingHelpersTest < Test::Unit::TestCase
   def setup
     @klass  = Contact
@@ -217,3 +247,16 @@ class NamingHelpersTest < Test::Unit::TestCase
       ActiveModel::Naming.send(method, *args)
     end
 end
+
+class NameWithAnonymousClassTest < Test::Unit::TestCase
+  def test_anonymous_class_without_name_argument
+    assert_raises(ArgumentError) do
+      ActiveModel::Name.new(Class.new)
+    end
+  end
+
+  def test_anonymous_class_with_name_argument
+    model_name = ActiveModel::Name.new(Class.new, nil, "Anonymous")
+    assert_equal "Anonymous", model_name
+  end
+end
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializable/json_test.rb
index a754d610b9..ad5b04091e 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializable/json_test.rb
@@ -5,7 +5,7 @@ require 'active_support/core_ext/object/instance_variables'
 
 class Contact
   extend ActiveModel::Naming
-  include ActiveModel::Serializers::JSON
+  include ActiveModel::Serializable::JSON
   include ActiveModel::Validations
 
   def attributes=(hash)
diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializable/xml_test.rb
index fc73d9dcd8..817ca1e736 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializable/xml_test.rb
@@ -5,7 +5,7 @@ require 'ostruct'
 
 class Contact
   extend ActiveModel::Naming
-  include ActiveModel::Serializers::Xml
+  include ActiveModel::Serializable::XML
 
   attr_accessor :address, :friends
 
@@ -24,7 +24,7 @@ end
 
 class Address
   extend ActiveModel::Naming
-  include ActiveModel::Serializers::Xml
+  include ActiveModel::Serializable::XML
 
   attr_accessor :street, :city, :state, :zip
 
diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serializable_test.rb
index b8dad9d51f..46ee372c6f 100644
--- a/activemodel/test/cases/serialization_test.rb
+++ b/activemodel/test/cases/serializable_test.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/instance_variables'
 
 class SerializationTest < ActiveModel::TestCase
   class User
-    include ActiveModel::Serialization
+    include ActiveModel::Serializable
 
     attr_accessor :name, :email, :gender, :address, :friends
 
@@ -22,7 +22,7 @@ class SerializationTest < ActiveModel::TestCase
   end
 
   class Address
-    include ActiveModel::Serialization
+    include ActiveModel::Serializable
 
     attr_accessor :street, :city, :state, :zip