aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext/date_time_ext_test.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-06-07 23:03:59 -0400
committerwycats <wycats@gmail.com>2010-06-07 23:03:59 -0400
commitb97a3f33a36f936531e608343797b99268f8bd92 (patch)
tree94abb825948b826fefdfd8952c25a9f3f3690772 /activesupport/test/core_ext/date_time_ext_test.rb
parent0042f4166f783085eb909d69d542b5323d8af5d6 (diff)
parentacef8feafa8a44271eb28685e180f8c28b7e4a0f (diff)
downloadrails-b97a3f33a36f936531e608343797b99268f8bd92.tar.gz
rails-b97a3f33a36f936531e608343797b99268f8bd92.tar.bz2
rails-b97a3f33a36f936531e608343797b99268f8bd92.zip
Merge remote branch 'rsim/oracle_enhanced_rails3'
Diffstat (limited to 'activesupport/test/core_ext/date_time_ext_test.rb')
-rw-r--r--activesupport/test/core_ext/date_time_ext_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index eba8170cda..19d7935211 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -26,11 +26,11 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
end
def test_to_date
- assert_equal Date.new(2005, 2, 21), DateTime.new(2005, 2, 21).to_date
+ assert_equal Date.new(2005, 2, 21), DateTime.new(2005, 2, 21, 14, 30, 0).to_date
end
def test_to_datetime
- assert_equal DateTime.new(2005, 2, 21), DateTime.new(2005, 2, 21).to_datetime
+ assert_equal DateTime.new(2005, 2, 21, 14, 30, 0), DateTime.new(2005, 2, 21, 14, 30, 0).to_datetime
end
def test_to_time