diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-26 19:53:32 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-26 19:53:32 -0700 |
| commit | 94f6b3dcfa454043307ba32045223eea0358de67 (patch) | |
| tree | b56eb43b83515e2d08fc5ad745f624a31436bc4a /activemodel/test | |
| parent | b79444053c6e000180c3b7787140bdb3cdafa183 (diff) | |
| parent | 10d9cb2052610202b4f1b2db4b822aa5850b1da4 (diff) | |
| download | rails-94f6b3dcfa454043307ba32045223eea0358de67.tar.gz rails-94f6b3dcfa454043307ba32045223eea0358de67.tar.bz2 rails-94f6b3dcfa454043307ba32045223eea0358de67.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 | ||||
| -rwxr-xr-x | activemodel/test/cases/serializers/xml_serialization_test.rb | 2 | ||||
| -rw-r--r-- | activemodel/test/models/contact.rb | 1 |
3 files changed, 0 insertions, 4 deletions
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 |