Fix tests, use timestamp

This commit is contained in:
Oliver Davies 2019-02-13 06:55:18 +00:00
parent 8c3b9db2f3
commit 0c8c2f8eb7
2 changed files with 14 additions and 16 deletions

View file

@ -9,8 +9,6 @@ use Twig_SimpleFunction;
class TalksExtension extends Twig_Extension class TalksExtension extends Twig_Extension
{ {
const DATE_FORMAT = 'Y-m-d';
/** /**
* @var string The current date. * @var string The current date.
*/ */

View file

@ -28,15 +28,15 @@ class TalksExtensionTest extends TestCase
$talkA = [ $talkA = [
'title' => 'Talk A', 'title' => 'Talk A',
'events' => [ 'events' => [
['event' => 'event_a', 'date' => (new DateTime('-1 days'))->format(TalksExtension::DATE_FORMAT)], ['event' => 'event_a', 'date' => (new DateTime('-1 days'))->getTimestamp()],
['event' => 'event_b', 'date' => (new DateTime('+1 days'))->format(TalksExtension::DATE_FORMAT)], ['event' => 'event_b', 'date' => (new DateTime('+1 days'))->getTimestamp()],
], ],
]; ];
$talkB = [ $talkB = [
'title' => 'Talk B', 'title' => 'Talk B',
'events' => [ 'events' => [
['event' => 'event_a', 'date' => (new DateTime('-3 days'))->format(TalksExtension::DATE_FORMAT)], ['event' => 'event_a', 'date' => (new DateTime('-3 days'))->getTimestamp()],
], ],
]; ];
@ -49,22 +49,22 @@ class TalksExtensionTest extends TestCase
$talkA = [ $talkA = [
'title' => 'Talk A', 'title' => 'Talk A',
'events' => [ 'events' => [
['event' => 'event_a', 'date' => (new DateTime('-5 days'))->format(TalksExtension::DATE_FORMAT)], ['event' => 'event_a', 'date' => (new DateTime('-5 days'))->getTimestamp()],
], ],
]; ];
$talkB = [ $talkB = [
'title' => 'Talk B', 'title' => 'Talk B',
'events' => [ 'events' => [
['event' => 'event_a', 'date' => (new DateTime('-20 days'))->format(TalksExtension::DATE_FORMAT)], ['event' => 'event_a', 'date' => (new DateTime('-20 days'))->getTimestamp()],
], ],
]; ];
$talkC = [ $talkC = [
'title' => 'Talk C', 'title' => 'Talk C',
'events' => [ 'events' => [
['event' => 'event_a', 'date' => (new DateTime('-3 days'))->format(TalksExtension::DATE_FORMAT)], ['event' => 'event_a', 'date' => (new DateTime('-3 days'))->getTimestamp()],
['event' => 'event_b', 'date' => (new DateTime('-10 days'))->format(TalksExtension::DATE_FORMAT)], ['event' => 'event_b', 'date' => (new DateTime('-10 days'))->getTimestamp()],
], ],
]; ];
@ -80,14 +80,14 @@ class TalksExtensionTest extends TestCase
$pastTalk = [ $pastTalk = [
'title' => 'Past talk', 'title' => 'Past talk',
'events' => [ 'events' => [
['date' => (new DateTime('-1 day'))->format(TalksExtension::DATE_FORMAT)], ['date' => (new DateTime('-1 day'))->getTimestamp()],
] ]
]; ];
$futureTalk = [ $futureTalk = [
'title' => 'Future talk', 'title' => 'Future talk',
'events' => [ 'events' => [
['date' => (new DateTime('+1 day'))->format(TalksExtension::DATE_FORMAT)], ['date' => (new DateTime('+1 day'))->getTimestamp()],
], ],
]; ];
@ -103,21 +103,21 @@ class TalksExtensionTest extends TestCase
$pastTalk = [ $pastTalk = [
'title' => 'Past talk', 'title' => 'Past talk',
'events' => [ 'events' => [
['date' => (new DateTime('-1 day'))->format(TalksExtension::DATE_FORMAT)], ['date' => (new DateTime('-1 day'))->getTimestamp()],
] ]
]; ];
$todayTalk = [ $todayTalk = [
'title' => 'A talk that it happening today', 'title' => 'A talk that it happening today',
'events' => [ 'events' => [
['date' => (new DateTime('now'))->format(TalksExtension::DATE_FORMAT)], ['date' => (new DateTime('now'))->getTimestamp()],
], ],
]; ];
$futureTalk = [ $futureTalk = [
'title' => 'Future talk', 'title' => 'Future talk',
'events' => [ 'events' => [
['date' => (new DateTime('+1 day'))->format(TalksExtension::DATE_FORMAT)], ['date' => (new DateTime('+1 day'))->getTimestamp()],
], ],
]; ];
@ -133,8 +133,8 @@ class TalksExtensionTest extends TestCase
$talk = [ $talk = [
'title' => 'An upcoming talk that has been given before', 'title' => 'An upcoming talk that has been given before',
'events' => [ 'events' => [
['date' => (new DateTime('-1 week'))->format(TalksExtension::DATE_FORMAT)], ['date' => (new DateTime('-1 week'))->getTimestamp()],
['date' => (new DateTime('+1 week'))->format(TalksExtension::DATE_FORMAT)], ['date' => (new DateTime('+1 week'))->getTimestamp()],
], ],
]; ];