1 files changed, 11 insertions, 3 deletions
diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serialization_test.rb
index 29bcdeae67..b8dad9d51f 100644
--- a/activemodel/test/cases/serialization_test.rb
+++ b/activemodel/test/cases/serialization_test.rb
@@ -77,12 +77,12 @@ class SerializationTest < ActiveModel::TestCase
     assert_equal expected , @user.serializable_hash(:methods => [:bar])
   end
 
-  def test_should_not_call_methods_for_attributes
-    def @user.name
+  def test_should_use_read_attribute_for_serialization
+    def @user.read_attribute_for_serialization(n)
       "Jon"
     end
 
-    expected = { "name" => "David" }
+    expected = { "name" => "Jon" }
     assert_equal expected, @user.serializable_hash(:only => :name)
   end
 
@@ -140,4 +140,12 @@ class SerializationTest < ActiveModel::TestCase
     assert_equal expected , @user.serializable_hash(:except => :gender, :include => {:friends => {:except => :gender}})
   end
 
+  def test_multiple_includes_with_options
+    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                 :address=>{"street"=>"123 Lane"},
+                 :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
+    assert_equal expected , @user.serializable_hash(:include => [{:address => {:only => "street"}}, :friends])
+  end
+
 end