From b3678c679595508b3b199b067ca785ec7fcc39a1 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 9 Aug 2006 20:06:19 +0000 Subject: [PATCH] fix bad minute spec in Session/DateTime/epochToHttp. Add tests to cover --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Session/DateTime.pm | 2 +- t/Session/DateTime.t | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 7d62ae68e..2b797e000 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.0.6 +- fix: Error in DateTime.pm 7.0.5 diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm index 55fa37c96..7c35d21d4 100644 --- a/lib/WebGUI/Session/DateTime.pm +++ b/lib/WebGUI/Session/DateTime.pm @@ -258,7 +258,7 @@ sub epochToHttp { my $time_zone = $self->getTimeZone(); my $dt = DateTime->from_epoch(epoch=>$epoch, time_zone=>$time_zone); $dt->set_time_zone('GMT'); - return $dt->strftime('%a, %d %b %Y %H:%m:%S GMT'); + return $dt->strftime('%a, %d %b %Y %H:%M:%S GMT'); } #------------------------------------------------------------------- diff --git a/t/Session/DateTime.t b/t/Session/DateTime.t index 8c3cd54d0..c19540669 100644 --- a/t/Session/DateTime.t +++ b/t/Session/DateTime.t @@ -15,7 +15,7 @@ use lib "$FindBin::Bin/../lib"; use WebGUI::Test; use WebGUI::Session; -use Test::More tests => 29; # increment this value for each test you create +use Test::More tests => 30; # increment this value for each test you create my $session = WebGUI::Test->session; @@ -30,8 +30,9 @@ is($session->datetime->epochToHuman($wgbday,"%y"), "2001", "epochToHuman() - yea is($session->datetime->epochToHuman($wgbday,"%c"), "August", "epochToHuman() - month name"); is($session->datetime->epochToHuman($wgbday,"%m"), "08", "epochToHuman() - month number, 2 digit"); is($session->datetime->epochToHuman($wgbday,"%M"), "8", "epochToHuman() - month number, variable digit"); +is($session->datetime->epochToHuman($wgbday,"%n"), "00", "epochToHuman() - 2 digit minute"); is($session->datetime->epochToHuman($wgbday,"%%%c%d%h"), "%August1608", "epochToHuman()"); -is($session->datetime->epochToHttp($wgbday),"Thu, 16 Aug 2001 13:08:00 GMT","epochToHttp()"); +is($session->datetime->epochToHttp($wgbday),"Thu, 16 Aug 2001 13:00:00 GMT","epochToHttp()"); is($session->datetime->epochToMail($wgbday),"Thu, 16 Aug 2001 08:00:00 -0500","epochToMail()"); is($session->datetime->epochToSet($wgbday,1), "2001-08-16 08:00:00", "epochToSet()"); is($session->datetime->getDayName(7), "Sunday", "getDayName()");