]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Add test for same day filter 1393/head
authorJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 23 Aug 2015 20:06:27 +0000 (22:06 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Sun, 23 Aug 2015 20:06:27 +0000 (22:06 +0200)
src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php

index 20ced679c5e795ae8f0b568ae3279aa17e9e11fa..cfdbfe973f759a7545e8bca9694d8aa90b26d388 100644 (file)
@@ -8,7 +8,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * This custom class override the default behavior of LexikFilterBundle on `filter_date_range`
- * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59)
+ * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59).
  */
 class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
 {
@@ -17,17 +17,17 @@ class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements Event
      */
     public function filterDateRange(GetFilterConditionEvent $event)
     {
-        $expr   = $event->getFilterQuery()->getExpressionBuilder();
+        $expr = $event->getFilterQuery()->getExpressionBuilder();
         $values = $event->getValues();
-        $value  = $values['value'];
+        $value = $values['value'];
 
         // left date should start at midnight
-        if (isset($value['left_date'][0]) && $value['left_date'][0] instanceOf \DateTime) {
+        if (isset($value['left_date'][0]) && $value['left_date'][0] instanceof \DateTime) {
             $value['left_date'][0]->setTime(0, 0, 0);
         }
 
         // right adte should end one second before midnight
-        if (isset($value['right_date'][0]) && $value['right_date'][0] instanceOf \DateTime) {
+        if (isset($value['right_date'][0]) && $value['right_date'][0] instanceof \DateTime) {
             $value['right_date'][0]->setTime(23, 59, 59);
         }
 
index 5f0a6076388535821460c9c5eb83f0561c11d032..a096628582cc4a6209e48ecc3f1f7e5a2dc57775 100644 (file)
@@ -278,6 +278,15 @@ class EntryControllerTest extends WallabagCoreTestCase
 
         $this->assertCount(5, $crawler->filter('div[class=entry]'));
 
+        $data = array(
+            'entry_filter[createdAt][left_date]' => date('d/m/Y'),
+            'entry_filter[createdAt][right_date]' => date('d/m/Y'),
+        );
+
+        $crawler = $client->submit($form, $data);
+
+        $this->assertCount(5, $crawler->filter('div[class=entry]'));
+
         $data = array(
             'entry_filter[createdAt][left_date]' => '01/01/1970',
             'entry_filter[createdAt][right_date]' => '01/01/1970',