AM::Serializers::Xml depends on AM::Naming

4 files changed, 4 insertions, 4 deletions

diff --git a/activemodel/lib/active_model/serializers/xml.rb b/activemodel/lib/active_model/serializers/xml.rb
index cf742d0569..09ea849e9e 100755
--- a/activemodel/lib/active_model/serializers/xml.rb
+++ b/activemodel/lib/active_model/serializers/xml.rb
@@ -10,6 +10,10 @@ module ActiveModel
       extend ActiveSupport::Concern
       include ActiveModel::Serialization
 
+      included do
+        extend ActiveModel::Naming
+      end
+
       class Serializer #:nodoc:
         class Attribute #:nodoc:
           attr_reader :name, :value, :type
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index e2690f1827..bb5be8cdeb 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -4,7 +4,6 @@ require 'models/automobile'
 require 'active_support/core_ext/object/instance_variables'
 
 class Contact
-  extend ActiveModel::Naming
   include ActiveModel::Serializers::JSON
   include ActiveModel::Validations
 
diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index e2bb0dda0b..90ddf8ff0c 100755
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -4,7 +4,6 @@ require 'active_support/core_ext/object/instance_variables'
 require 'ostruct'
 
 class Contact
-  extend ActiveModel::Naming
   include ActiveModel::Serializers::Xml
 
   attr_accessor :address, :friends
@@ -25,7 +24,6 @@ class Customer < Struct.new(:name)
 end
 
 class Address
-  extend ActiveModel::Naming
   include ActiveModel::Serializers::Xml
 
   attr_accessor :street, :city, :state, :zip, :apt_number
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb
index 7bfc542afb..191e2b8d43 100644
--- a/activemodel/test/models/contact.rb
+++ b/activemodel/test/models/contact.rb
@@ -1,5 +1,4 @@
 class Contact
-  extend ActiveModel::Naming
   include ActiveModel::Conversion
 
   attr_accessor :id, :name, :age, :created_at, :awesome, :preferences