diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-30 18:38:28 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-30 18:48:17 +0100 |
| commit | 5b2eb64ceb08cd005dc06b721935de5853971473 (patch) | |
| tree | 6af4ba143b6948c6c97d7fb0937397a425a2e17c /activemodel/test | |
| parent | be99f0c7eb4734011b9ee435bb5ac4a0b916a065 (diff) | |
| download | rails-5b2eb64ceb08cd005dc06b721935de5853971473.tar.gz rails-5b2eb64ceb08cd005dc06b721935de5853971473.tar.bz2 rails-5b2eb64ceb08cd005dc06b721935de5853971473.zip | |
Revert "Implement ArraySerializer and move old serialization API to a new namespace."
This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0.
Conflicts:
activemodel/lib/active_model.rb
activemodel/lib/active_model/serializable.rb
activemodel/lib/active_model/serializer.rb
activemodel/test/cases/serializer_test.rb
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 |