joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Added round up to Time::ago

Browse source 
Some strings were resulting in returns of "24 hours" and "7 days" that needed to be rounded up to the next increment. Closes #28
This commit is contained in:
Joshua Sherman 2014-02-02 09:47:24 -05:00
parent 2559672246
commit 4c59f7c55b
2 changed files with 119 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

76
tests/classes/TimeTest.php
View file

@ -32,41 +32,64 @@ class TimeTest extends PHPUnit_Framework_TestCase
$this->assertEquals('seconds ago', Time::ago(strtotime('-30 seconds')));
}
public function testAgoPastTimeMinute()
{
$this->assertEquals('a minute ago', Time::ago(strtotime('-1 minutes')));
}
public function testAgoPastTimeMinutes()
{
$this->assertEquals('5 minutes ago', Time::ago(strtotime('-5 minutes')));
}
public function testAgoPastTimeHour()
{
$this->assertEquals('an hour ago', Time::ago(strtotime('-1 hours')));
}
public function testAgoPastTimeHours()
{
$this->assertEquals('1 hour ago', Time::ago(strtotime('-1 hour')));
$this->assertEquals('2 hours ago', Time::ago(strtotime('-2 hours')));
}
public function testAgoPastTimeDay()
{
$this->assertEquals('a day ago', Time::ago(strtotime('-1 days')));
}
public function testAgoPastTimeDays()
{
$this->assertEquals('1 day ago', Time::ago(strtotime('-1 day')));
$this->assertEquals('2 days ago', Time::ago(strtotime('-2 days')));
}
/* @todo Need to fix these results so it doesn't fail.
public function testAgoPastTimeDays2()
public function testAgoPastTimeWeek()
{
$this->assertEquals('1 day ago', Time::ago(strtotime('-23 hours -55 minutes')));
$this->assertEquals('a week ago', Time::ago(strtotime('-1 weeks')));
}
*/
public function testAgoPastTimeWeeks()
{
$this->assertEquals('1 week ago', Time::ago(strtotime('-1 week')));
$this->assertEquals('2 weeks ago', Time::ago(strtotime('-2 weeks')));
}
public function testAgoPastTimeMonth()
{
$this->assertEquals('a month ago', Time::ago(strtotime('-1 months')));
}
public function testAgoPastTimeMonths()
{
$this->assertEquals('1 month ago', Time::ago(strtotime('-1 month')));
$this->assertEquals('2 months ago', Time::ago(strtotime('-2 months')));
}
public function testAgoPastTimeYear()
{
$this->assertEquals('a year ago', Time::ago(strtotime('-1 years')));
}
public function testAgoPastTimeYears()
{
$this->assertEquals('1 year ago', Time::ago(strtotime('-1 year')));
$this->assertEquals('2 years ago', Time::ago(strtotime('-2 years')));
}
public function testAgoFutureTimeSeconds()
@ -81,33 +104,58 @@ class TimeTest extends PHPUnit_Framework_TestCase
public function testAgoFutureTimeHours()
{
$this->assertEquals('1 hour from now', Time::ago(strtotime('+1 hour')));
$this->assertEquals('an hour from now', Time::ago(strtotime('+1 hour')));
}
public function testAgoFutureTimeDays()
{
$this->assertEquals('1 day from now', Time::ago(strtotime('+1 day')));
$this->assertEquals('a day from now', Time::ago(strtotime('+1 day')));
}
public function testAgoFutureTimeWeeks()
{
$this->assertEquals('1 week from now', Time::ago(strtotime('+1 week')));
$this->assertEquals('a week from now', Time::ago(strtotime('+1 week')));
}
public function testAgoFutureTimeMonths()
{
$this->assertEquals('1 month from now', Time::ago(strtotime('+1 month')));
$this->assertEquals('a month from now', Time::ago(strtotime('+1 month')));
}
public function testAgoFutureTimeYears()
{
$this->assertEquals('1 year from now', Time::ago(strtotime('+1 year')));
$this->assertEquals('a year from now', Time::ago(strtotime('+1 year')));
}
public function testTimestamp()
{
$this->assertEquals(gmdate('Y-m-d H:i:s'), Time::timestamp());
}
public function testRoundUpHour()
{
$this->assertEquals('an hour ago', Time::ago(strtotime('-59 minutes -55 seconds')));
}
public function testRoundUpDay()
{
$this->assertEquals('a day ago', Time::ago(strtotime('-23 hours -55 minutes')));
}
public function testRoundUpWeek()
{
$this->assertEquals('a week ago', Time::ago(strtotime('-6 days -23 hours')));
}
public function testRoundUpMonth()
{
$this->assertEquals('a month ago', Time::ago(strtotime('-29 days')));
}
public function testRoundUpYear()
{
$this->assertEquals('a year ago', Time::ago(strtotime('-364 days')));
}
}
?>