From 94bd2cedcf139eba5718016231d15e2d7fffe079 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 28 Oct 2012 16:15:20 -0400 Subject: [PATCH] Fix more off by a second errors --- lib/Cake/Test/Case/Utility/CakeTimeTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php index eadb1cde0..f21d066c8 100644 --- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php @@ -340,14 +340,14 @@ class CakeTimeTest extends CakeTestCase { $this->assertEquals(date('Y-d-m', $time), $this->Time->nice($time)); $this->assertEquals('%Y-%d-%m', $this->Time->niceFormat); - CakeTime::$niceFormat = '%Y-%d-%m %H:%M:%S'; - $this->assertEquals(date('Y-d-m H:i:s', $time), $this->Time->nice($time)); - $this->assertEquals('%Y-%d-%m %H:%M:%S', $this->Time->niceFormat); + CakeTime::$niceFormat = '%Y-%d-%m %H:%M'; + $this->assertEquals(date('Y-d-m H:i', $time), $this->Time->nice($time)); + $this->assertEquals('%Y-%d-%m %H:%M', $this->Time->niceFormat); date_default_timezone_set('UTC'); $result = $this->Time->nice(null, 'America/New_York'); $expected = $this->Time->nice(time(), 'America/New_York'); - $this->assertEquals($expected, $result); + $this->assertEquals(substr($expected, 0, -1), substr($result, 0, -1)); $this->_restoreSystemTimezone(); }