aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/serialization_test.rb (renamed from activemodel/test/cases/serializable_test.rb)4
-rw-r--r--activemodel/test/cases/serializers/json_serialization_test.rb (renamed from activemodel/test/cases/serializable/json_test.rb)2
-rw-r--r--activemodel/test/cases/serializers/xml_serialization_test.rb (renamed from activemodel/test/cases/serializable/xml_test.rb)4
3 files changed, 5 insertions, 5 deletions
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 e5364d9858..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)
diff --git a/activemodel/test/cases/serializable/xml_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index 834c4de1e1..38aecf51ff 100644
--- a/activemodel/test/cases/serializable/xml_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -5,7 +5,7 @@ require 'ostruct'
class Contact
extend ActiveModel::Naming
- include ActiveModel::Serializable::XML
+ include ActiveModel::Serializers::Xml
attr_accessor :address, :friends
@@ -26,7 +26,7 @@ end
class Address
extend ActiveModel::Naming
- include ActiveModel::Serializable::XML
+ include ActiveModel::Serializers::Xml
attr_accessor :street, :city, :state, :zip