diff options
| author | Lesstat <florianbarth@gmx.de> | 2015-07-11 11:44:26 +0200 |
|---|---|---|
| committer | Lesstat <florianbarth@gmx.de> | 2015-07-11 11:44:26 +0200 |
| commit | a85a1c613239c20fe72eb96c2921f4c220ec156b (patch) | |
| tree | d032b4591e518cbbbfaa8886f8f5d98a6ea2efb7 /tests/units/DateParserTest.php | |
| parent | 5101eaa8060ce3c75a81a26f6e47aae40e3d4ac3 (diff) | |
| parent | 7e94d0ca233d15d6124c0adf3f956a119c82ccae (diff) | |
Merged branch 'master' of https://github.com/fguillot/kanboard
only imports conflicted
Diffstat (limited to 'tests/units/DateParserTest.php')
| -rw-r--r-- | tests/units/DateParserTest.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/units/DateParserTest.php b/tests/units/DateParserTest.php index 9403063b..4b3e93c8 100644 --- a/tests/units/DateParserTest.php +++ b/tests/units/DateParserTest.php @@ -56,6 +56,12 @@ class DateParserTest extends Base $this->assertEquals('2014-03-05', date('Y-m-d', $d->getTimestamp('2014-03-05'))); $this->assertEquals('2014-03-05', date('Y-m-d', $d->getTimestamp('2014_03_05'))); $this->assertEquals('2014-03-05', date('Y-m-d', $d->getTimestamp('03/05/2014'))); + $this->assertEquals('2014-03-25 17:18', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 5:18 pm'))); + $this->assertEquals('2014-03-25 05:18', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 5:18 am'))); + $this->assertEquals('2014-03-25 05:18', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 5:18am'))); + $this->assertEquals('2014-03-25 23:14', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 23:14'))); + $this->assertEquals('2014-03-29 23:14', date('Y-m-d H:i', $d->getTimestamp('2014_03_29 23:14'))); + $this->assertEquals('2014-03-29 23:14', date('Y-m-d H:i', $d->getTimestamp('2014-03-29 23:14'))); } public function testConvert() |