diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-26 19:53:32 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-27 12:56:28 -0200 |
| commit | 4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d (patch) | |
| tree | 35e09b9a91321ab02f4faa76e87617db139b19cb /activemodel/test | |
| parent | 7f09bcd1810fb8295cde1f54c6eece260fdd4519 (diff) | |
| download | rails-4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d.tar.gz rails-4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d.tar.bz2 rails-4b1a7bcc4ceefeebaa14dbc2571a2e6cd593556d.zip | |
Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
Diffstat (limited to 'activemodel/test')
| -rw-r--r-- | activemodel/test/cases/serializers/json_serialization_test.rb | 1 | ||||
| -rw-r--r-- | activemodel/test/cases/serializers/xml_serialization_test.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb index 4ac5fb1779..4eabe82153 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 7f14b21cf4..83db8d21f4 100644 --- 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 |