4 files changed, 28 insertions, 11 deletions
diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index 67471ed497..90f9b78334 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/activemodel/test/cases/attribute_methods_test.rb
@@ -134,20 +134,33 @@ class AttributeMethodsTest < ActiveModel::TestCase
   end
 
   test '#define_attr_method generates attribute method' do
-    ModelWithAttributes.define_attr_method(:bar, 'bar')
+    assert_deprecated do
+      ModelWithAttributes.define_attr_method(:bar, 'bar')
+    end
 
     assert_respond_to ModelWithAttributes, :bar
-    assert_equal "original bar", ModelWithAttributes.original_bar
+
+    assert_deprecated do
+      assert_equal "original bar", ModelWithAttributes.original_bar
+    end
+
     assert_equal "bar", ModelWithAttributes.bar
-    ModelWithAttributes.define_attr_method(:bar)
+    ActiveSupport::Deprecation.silence do
+      ModelWithAttributes.define_attr_method(:bar)
+    end
     assert !ModelWithAttributes.bar
   end
 
   test '#define_attr_method generates attribute method with invalid identifier characters' do
-    ModelWithWeirdNamesAttributes.define_attr_method(:'c?d', 'c?d')
+    ActiveSupport::Deprecation.silence do
+      ModelWithWeirdNamesAttributes.define_attr_method(:'c?d', 'c?d')
+    end
 
     assert_respond_to ModelWithWeirdNamesAttributes, :'c?d'
-    assert_equal "original c?d", ModelWithWeirdNamesAttributes.send('original_c?d')
+
+    ActiveSupport::Deprecation.silence do
+      assert_equal "original c?d", ModelWithWeirdNamesAttributes.send('original_c?d')
+    end
     assert_equal "c?d", ModelWithWeirdNamesAttributes.send('c?d')
   end
 
diff --git a/activemodel/test/cases/serializable_test.rb b/activemodel/test/cases/serialization_test.rb
index 46ee372c6f..b8dad9d51f 100644
--- a/activemodel/test/cases/serializable_test.rb
+++ b/activemodel/test/cases/serialization_test.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/instance_variables'
 
 class SerializationTest < ActiveModel::TestCase
   class User
-    include ActiveModel::Serializable
+    include ActiveModel::Serialization
 
     attr_accessor :name, :email, :gender, :address, :friends
 
@@ -22,7 +22,7 @@ class SerializationTest < ActiveModel::TestCase
   end
 
   class Address
-    include ActiveModel::Serializable
+    include ActiveModel::Serialization
 
     attr_accessor :street, :city, :state, :zip
 
diff --git a/activemodel/test/cases/serializable/json_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index ad5b04091e..4ac5fb1779 100644
--- a/activemodel/test/cases/serializable/json_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -5,7 +5,7 @@ require 'active_support/core_ext/object/instance_variables'
 
 class Contact
   extend ActiveModel::Naming
-  include ActiveModel::Serializable::JSON
+  include ActiveModel::Serializers::JSON
   include ActiveModel::Validations
 
   def attributes=(hash)
@@ -14,9 +14,11 @@ class Contact
     end
   end
 
+  remove_method :attributes if method_defined?(:attributes)
+
   def attributes
     instance_values
-  end unless method_defined?(:attributes)
+  end
 end
 
 class JsonSerializationTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/serializable/xml_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index 817ca1e736..38aecf51ff 100644
--- a/activemodel/test/cases/serializable/xml_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -5,10 +5,12 @@ require 'ostruct'
 
 class Contact
   extend ActiveModel::Naming
-  include ActiveModel::Serializable::XML
+  include ActiveModel::Serializers::Xml
 
   attr_accessor :address, :friends
 
+  remove_method :attributes if method_defined?(:attributes)
+
   def attributes
     instance_values.except("address", "friends")
   end
@@ -24,7 +26,7 @@ end
 
 class Address
   extend ActiveModel::Naming
-  include ActiveModel::Serializable::XML
+  include ActiveModel::Serializers::Xml
 
   attr_accessor :street, :city, :state, :zip