aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/cases/serializeration/json_serialization_test.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-21 11:27:23 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-21 11:27:23 -0300
commitf32c3709830eb8d9f68a59c94f6791621c2b52ac (patch)
treeb34cf0b9321dfd40b795cc761b158be4cbde48f6 /activemodel/test/cases/serializeration/json_serialization_test.rb
parent9a28bd787660b08aae36155066e61d3608d0b4dd (diff)
parent9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff)
downloadrails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.gz
rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.bz2
rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.zip
Merge commit 'rails/master'
Diffstat (limited to 'activemodel/test/cases/serializeration/json_serialization_test.rb')
-rw-r--r--activemodel/test/cases/serializeration/json_serialization_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activemodel/test/cases/serializeration/json_serialization_test.rb b/activemodel/test/cases/serializeration/json_serialization_test.rb
index 3e69db110e..6227aedc39 100644
--- a/activemodel/test/cases/serializeration/json_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/json_serialization_test.rb
@@ -3,6 +3,10 @@ require 'models/contact'
class Contact
include ActiveModel::Serializers::JSON
+
+ def attributes
+ instance_values
+ end
end
class JsonSerializationTest < ActiveModel::TestCase