1 files changed, 18 insertions, 7 deletions
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index 803a054d7e..23a170388e 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -10,13 +10,24 @@ module ActiveRecord
     end
 
     def assert_date_from_db(expected, actual, message = nil)
-      # SybaseAdapter doesn't have a separate column type just for dates,
-      # so the time is in the string and incorrectly formatted
-      if current_adapter?(:SybaseAdapter)
-        assert_equal expected.to_s, actual.to_date.to_s, message
-      else
-        assert_equal expected.to_s, actual.to_s, message
-      end
+      assert_equal expected.to_s, actual.to_s, message
+    end
+
+    def capture(stream)
+      stream = stream.to_s
+      captured_stream = Tempfile.new(stream)
+      stream_io = eval("$#{stream}")
+      origin_stream = stream_io.dup
+      stream_io.reopen(captured_stream)
+
+      yield
+
+      stream_io.rewind
+      return captured_stream.read
+    ensure
+      captured_stream.close
+      captured_stream.unlink
+      stream_io.reopen(origin_stream)
     end
 
     def capture_sql