2 files changed, 31 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 4aa6567d85..1cfaf552af 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -250,7 +250,8 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert_nil Post.all.merge!(:includes => :author).find(posts(:authorless).id).author
   end
 
-  def test_nested_loading_with_no_associations
+  # Regression test for 21c75e5
+  def test_nested_loading_does_not_raise_exception_when_association_does_not_exist
     assert_nothing_raised do
       Post.all.merge!(:includes => {:author => :author_addresss}).find(posts(:authorless).id)
     end
diff --git a/activerecord/test/cases/attribute_methods/serialization_test.rb b/activerecord/test/cases/attribute_methods/serialization_test.rb
new file mode 100644
index 0000000000..75de773961
--- /dev/null
+++ b/activerecord/test/cases/attribute_methods/serialization_test.rb
@@ -0,0 +1,29 @@
+require "cases/helper"
+
+module ActiveRecord
+  module AttributeMethods
+    class SerializationTest < ActiveSupport::TestCase
+      class FakeColumn < Struct.new(:name)
+        def type; :integer; end
+        def type_cast(s); "#{s}!"; end
+      end
+
+      class NullCoder
+        def load(v); v; end
+      end
+
+      def test_type_cast_serialized_value
+        value = Serialization::Attribute.new(NullCoder.new, "Hello world", :serialized)
+        type = Serialization::Type.new(FakeColumn.new)
+        assert_equal "Hello world!", type.type_cast(value)
+      end
+
+      def test_type_cast_unserialized_value
+        value = Serialization::Attribute.new(nil, "Hello world", :unserialized)
+        type = Serialization::Type.new(FakeColumn.new)
+        type.type_cast(value)
+        assert_equal "Hello world", type.type_cast(value)
+      end
+    end
+  end
+end