1 files changed, 47 insertions, 71 deletions

diff --git a/activerecord/test/cases/serialized_attribute_test.rb b/activerecord/test/cases/serialized_attribute_test.rb
index 5609cf310c..186a1a2ade 100644
--- a/activerecord/test/cases/serialized_attribute_test.rb
+++ b/activerecord/test/cases/serialized_attribute_test.rb
@@ -14,8 +14,17 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     Topic.serialize("content")
   end
 
+  def test_serialize_does_not_eagerly_load_columns
+    assert_no_queries do
+      Topic.reset_column_information
+      Topic.serialize(:content)
+    end
+  end
+
   def test_list_of_serialized_attributes
-    assert_equal %w(content), Topic.serialized_attributes.keys
+    assert_deprecated do
+      assert_equal %w(content), Topic.serialized_attributes.keys
+    end
   end
 
   def test_serialized_attribute
@@ -29,12 +38,6 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal(myobj, topic.content)
   end
 
-  def test_serialized_attribute_init_with
-    topic = Topic.allocate
-    topic.init_with('attributes' => { 'content' => '--- foo' })
-    assert_equal 'foo', topic.content
-  end
-
   def test_serialized_attribute_in_base_class
     Topic.serialize("content", Hash)
 
@@ -46,34 +49,22 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal(hash, important_topic.content)
   end
 
-  # This test was added to fix GH #4004. Obviously the value returned
-  # is not really the value 'before type cast' so we should maybe think
-  # about changing that in the future.
-  def test_serialized_attribute_before_type_cast_returns_unserialized_value
-    Topic.serialize :content, Hash
-
-    t = Topic.new(content: { foo: :bar })
-    assert_equal({ foo: :bar }, t.content_before_type_cast)
-    t.save!
-    t.reload
-    assert_equal({ foo: :bar }, t.content_before_type_cast)
-  end
-
-  def test_serialized_attributes_before_type_cast_returns_unserialized_value
+  def test_serialized_attributes_from_database_on_subclass
     Topic.serialize :content, Hash
 
-    t = Topic.new(content: { foo: :bar })
-    assert_equal({ foo: :bar }, t.attributes_before_type_cast["content"])
+    t = Reply.new(content: { foo: :bar })
+    assert_equal({ foo: :bar }, t.content)
     t.save!
-    t.reload
-    assert_equal({ foo: :bar }, t.attributes_before_type_cast["content"])
+    t = Reply.last
+    assert_equal({ foo: :bar }, t.content)
   end
 
   def test_serialized_attribute_calling_dup_method
     Topic.serialize :content, JSON
 
-    t = Topic.new(:content => { :foo => :bar }).dup
-    assert_equal({ :foo => :bar }, t.content_before_type_cast)
+    orig = Topic.new(content: { foo: :bar })
+    clone = orig.dup
+    assert_equal(orig.content, clone.content)
   end
 
   def test_serialized_attribute_declared_in_subclass
@@ -116,8 +107,10 @@ class SerializedAttributeTest < ActiveRecord::TestCase
 
   def test_serialized_attribute_should_raise_exception_on_save_with_wrong_type
     Topic.serialize(:content, Hash)
-    topic = Topic.new(:content => "string")
-    assert_raise(ActiveRecord::SerializationTypeMismatch) { topic.save }
+    assert_raise(ActiveRecord::SerializationTypeMismatch) do
+      topic = Topic.new(content: 'string')
+      topic.save
+    end
   end
 
   def test_should_raise_exception_on_serialized_attribute_with_type_mismatch
@@ -168,45 +161,22 @@ class SerializedAttributeTest < ActiveRecord::TestCase
   end
 
   def test_serialize_with_coder
-    coder = Class.new {
-      # Identity
-      def load(thing)
-        thing
-      end
-
-      # base 64
-      def dump(thing)
-        [thing].pack('m')
+    some_class = Struct.new(:foo) do
+      def self.dump(value)
+        value.foo
       end
-    }.new
 
-    Topic.serialize(:content, coder)
-    s = 'hello world'
-    topic = Topic.new(:content => s)
-    assert topic.save
-    topic = topic.reload
-    assert_equal [s].pack('m'), topic.content
-  end
-
-  def test_serialize_with_bcrypt_coder
-    crypt_coder = Class.new {
-      def load(thing)
-        return unless thing
-        BCrypt::Password.new thing
+      def self.load(value)
+        new(value)
       end
+    end
 
-      def dump(thing)
-        BCrypt::Password.create(thing).to_s
-      end
-    }.new
-
-    Topic.serialize(:content, crypt_coder)
-    password = 'password'
-    topic = Topic.new(:content => password)
-    assert topic.save
-    topic = topic.reload
-    assert_kind_of BCrypt::Password, topic.content
-    assert_equal(true, topic.content == password, 'password should equal')
+    Topic.serialize(:content, some_class)
+    topic = Topic.new(:content => some_class.new('my value'))
+    topic.save!
+    topic.reload
+    assert_kind_of some_class, topic.content
+    assert_equal topic.content, some_class.new('my value')
   end
 
   def test_serialize_attribute_via_select_method_when_time_zone_available
@@ -235,13 +205,19 @@ class SerializedAttributeTest < ActiveRecord::TestCase
     assert_equal [], light.long_state
   end
 
-  def test_serialized_column_should_not_be_wrapped_twice
-    Topic.serialize(:content, MyObject)
+  def test_serialized_column_should_unserialize_after_update_column
+    t = Topic.create(content: "first")
+    assert_equal("first", t.content)
 
-    myobj = MyObject.new('value1', 'value2')
-    Topic.create(content: myobj)
-    Topic.create(content: myobj)
-    type = Topic.column_types["content"]
-    assert !type.instance_variable_get("@column").is_a?(ActiveRecord::AttributeMethods::Serialization::Type)
+    t.update_column(:content, Topic.type_for_attribute('content').type_cast_for_database("second"))
+    assert_equal("second", t.content)
+  end
+
+  def test_serialized_column_should_unserialize_after_update_attribute
+    t = Topic.create(content: "first")
+    assert_equal("first", t.content)
+
+    t.update_attribute(:content, "second")
+    assert_equal("second", t.content)
   end
 end