1 files changed, 14 insertions, 6 deletions
diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index 726338db14..b49c27bc78 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -1,5 +1,6 @@
 require 'cases/helper'
 require 'models/topic'
+require 'models/reply'
 require 'models/person'
 require 'models/traffic_light'
 require 'bcrypt'
@@ -18,12 +19,6 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal %w(content), Topic.serialized_attributes.keys
   end
 
-  def test_serialized_attributes_are_class_level_settings
-    topic = Topic.new
-    assert_raise(NoMethodError) { topic.serialized_attributes = [] }
-    assert_deprecated { topic.serialized_attributes }
-  end
-
   def test_serialized_attribute
     Topic.serialize("content", MyObject)
 
@@ -241,4 +236,17 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal [], light.state
     assert_equal [], light.long_state
   end
+
+  def test_serialized_column_should_not_be_wrapped_twice
+    Topic.serialize(:content, MyObject)
+
+    myobj = MyObject.new('value1', 'value2')
+    Topic.create(content: myobj)
+    Topic.create(content: myobj)
+
+    Topic.all.each do |topic|
+      type = topic.instance_variable_get("@columns_hash")["content"]
+      assert !type.instance_variable_get("@column").is_a?(ActiveRecord::AttributeMethods::Serialization::Type)
+    end
+  end
 end