2 files changed, 11 insertions, 7 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 9d3b81cf38..c795df124b 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -32,11 +32,7 @@ class String
   #   "2012-12-13".to_date #=> Thu, 13 Dec 2012
   #   "12/13/2012".to_date #=> ArgumentError: invalid date
   def to_date
-    unless blank?
-      date_values = ::Date._parse(self, false).values_at(:year, :mon, :mday)
-
-      ::Date.new(*date_values)
-    end
+    ::Date.parse(self, false) unless blank?
   end
 
   # Converts a string to a DateTime value.
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 27d444fd91..aa87598926 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -12,8 +12,8 @@ module ActiveSupport
     end
 
     class ProxyTestResult
-      def initialize
-        @calls = []
+      def initialize(calls = [])
+        @calls = calls
       end
 
       def add_error(e)
@@ -27,6 +27,14 @@ module ActiveSupport
         end
       end
 
+      def marshal_dump
+        @calls
+      end
+
+      def marshal_load(calls)
+        initialize(calls)
+      end
+
       def method_missing(name, *args)
         @calls << [name, args]
       end