diff options
author | Andrew White <andyw@pixeltrix.co.uk> | 2012-05-04 13:41:37 -0700 |
---|---|---|
committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-05-04 13:41:37 -0700 |
commit | a8a9091d4a47232f026e3c086858ba674c9f430e (patch) | |
tree | 74f8a3a0448378e4973fb354ca37b51cd03f24e1 /activesupport | |
parent | 7a093606f662cda2de597d81dde974ecbe375701 (diff) | |
parent | 6223d72b52b0d0bf0d8e0820673f4bf15b3321f6 (diff) | |
download | rails-a8a9091d4a47232f026e3c086858ba674c9f430e.tar.gz rails-a8a9091d4a47232f026e3c086858ba674c9f430e.tar.bz2 rails-a8a9091d4a47232f026e3c086858ba674c9f430e.zip |
Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-tests
Enable misnamed time_with_timezone_tests in activesupport core_ext
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 7cf3842a16..331010091e 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -191,7 +191,7 @@ class TimeWithZoneTest < ActiveSupport::TestCase end end - def future_with_time_current_as_time_with_zone + def test_future_with_time_current_as_time_with_zone twz = ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45) ) Time.stubs(:current).returns(twz) assert_equal false, ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,44)).future? @@ -482,32 +482,32 @@ class TimeWithZoneTest < ActiveSupport::TestCase assert_equal "Fri, 31 Dec 1999 19:00:30 EST -05:00", @twz.advance(:seconds => 30).inspect end - def beginning_of_year + def test_beginning_of_year assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect assert_equal "Fri, 01 Jan 1999 00:00:00 EST -05:00", @twz.beginning_of_year.inspect end - def end_of_year + def test_end_of_year assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_year.inspect end - def beginning_of_month + def test_beginning_of_month assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect - assert_equal "Fri, 01 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_month.inspect + assert_equal "Wed, 01 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_month.inspect end - def end_of_month + def test_end_of_month assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_month.inspect end - def beginning_of_day + def test_beginning_of_day assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect assert_equal "Fri, 31 Dec 1999 00:00:00 EST -05:00", @twz.beginning_of_day.inspect end - def end_of_day + def test_end_of_day assert_equal "Fri, 31 Dec 1999 19:00:00 EST -05:00", @twz.inspect assert_equal "Fri, 31 Dec 1999 23:59:59 EST -05:00", @twz.end_of_day.inspect end |