aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/core_ext/date_ext_test.rb17
-rw-r--r--activesupport/test/core_ext/time_ext_test.rb2
2 files changed, 18 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
new file mode 100644
index 0000000000..63a0cf5e6d
--- /dev/null
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -0,0 +1,17 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/date'
+
+class DateExtCalculationsTest < Test::Unit::TestCase
+ def test_to_s
+ assert_equal "21 Feb", Date.new(2005, 2, 21).to_s(:short)
+ assert_equal "February 21, 2005", Date.new(2005, 2, 21).to_s(:long)
+ end
+
+ def test_to_time
+ assert_equal Time.local(2005, 2, 21), Date.new(2005, 2, 21).to_time
+ end
+
+ def test_to_date
+ assert_equal Date.new(2005, 2, 21), Date.new(2005, 2, 21).to_date
+ end
+end \ No newline at end of file
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index dabc433c1f..5bdabb387e 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -90,7 +90,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
def test_to_s
assert_equal "2005-02-21 17:44:30", Time.local(2005, 2, 21, 17, 44, 30).to_s(:db)
assert_equal "21 Feb 17:44", Time.local(2005, 2, 21, 17, 44, 30).to_s(:short)
- assert_equal "21 February, 2005 17:44", Time.local(2005, 2, 21, 17, 44, 30).to_s(:long)
+ assert_equal "February 21, 2005 17:44", Time.local(2005, 2, 21, 17, 44, 30).to_s(:long)
end
def test_to_date