From d6abfcaf90c673efe71fa5debbabbb37736ac7cf Mon Sep 17 00:00:00 2001 From: mstra001 Date: Tue, 9 Sep 2014 16:09:00 +0200 Subject: [PATCH] Update tests for strfime() in timeAgoInWords() Add test asserts for testTimeAgoInWordsWithFormat with strftime format --- lib/Cake/Test/Case/Utility/CakeTimeTest.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php index 2d06e7d11..15d26b793 100644 --- a/lib/Cake/Test/Case/Utility/CakeTimeTest.php +++ b/lib/Cake/Test/Case/Utility/CakeTimeTest.php @@ -263,7 +263,7 @@ class CakeTimeTest extends CakeTestCase { } /** - * Test the format option of timeAgoInWords() + * Test the format option of timeAgoInWords() with date() and strftime compatible strings * * @return void */ @@ -271,8 +271,8 @@ class CakeTimeTest extends CakeTestCase { $result = $this->Time->timeAgoInWords('2007-9-25', 'Y-m-d'); $this->assertEquals('on 2007-09-25', $result); - $result = $this->Time->timeAgoInWords('2007-9-25', 'Y-m-d'); - $this->assertEquals('on 2007-09-25', $result); + $result = $this->Time->timeAgoInWords('2007-9-25', '%x'); + $this->assertEquals('on '. strftime('%x', strtotime('2007-9-25')), $result); $result = $this->Time->timeAgoInWords( strtotime('+2 weeks +2 days'), @@ -280,11 +280,23 @@ class CakeTimeTest extends CakeTestCase { ); $this->assertRegExp('/^2 weeks, [1|2] day(s)?$/', $result); + $result = $this->Time->timeAgoInWords( + strtotime('+2 weeks +2 days'), + '%x' + ); + $this->assertRegExp('/^2 weeks, [1|2] day(s)?$/', $result); + $result = $this->Time->timeAgoInWords( strtotime('+2 months +2 days'), array('end' => '1 month', 'format' => 'Y-m-d') ); $this->assertEquals('on ' . date('Y-m-d', strtotime('+2 months +2 days')), $result); + + $result = $this->Time->timeAgoInWords( + strtotime('+2 months +2 days'), + array('end' => '1 month', 'format' => '%x') + ); + $this->assertEquals('on ' . strftime('%x', strtotime('+2 months +2 days')), $result); } /**