fix an error in the EventRepetition model test and remove two unusefu…

…l date formatters
davide-casiraghi · Mar 29, 2020 · 1a42fa4 · 1a42fa4
1 parent c08f7b6
commit 1a42fa4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 47 deletions.
diff --git a/resources/views/emails/user-activation-confirmation.blade.php b/resources/views/emails/user-activation-confirmation.blade.php
diff --git a/resources/views/emails/user-activation.blade.php b/resources/views/emails/user-activation.blade.php
diff --git a/src/Models/EventRepetition.php b/src/Models/EventRepetition.php
@@ -264,7 +264,7 @@ public static function getFirstFutureEventRpDatesByEventId($eventId)
         $ret = self::
                 select('start_repeat', 'end_repeat')
                 ->where('event_id', $eventId)
-                ->where('start_repeat', '>', Carbon::now()->format('Y-m-d'))
+                ->where('start_repeat', '>', Carbon::now())
                 ->first();
 
         return $ret;
@@ -301,7 +301,7 @@ public static function getFirstEventRpIdByEventId($eventId): ?int
         $firstFutureEventRpIdByEventId = self::
                 select('id')
                 ->where('event_id', $eventId)
-                ->where('start_repeat', '>', Carbon::now()->format('Y-m-d'))
+                ->where('start_repeat', '>', Carbon::now())
                 ->first();
 
         if (! empty($firstFutureEventRpIdByEventId)) {

diff --git a/tests/EventModelTest.php b/tests/EventModelTest.php
@@ -272,16 +272,16 @@ public function it_gets_if_event_is_active()
         // Event in the future
         $attributes = factory(Event::class)->raw([
             'title'=>'test title 1',
-            'startDate' => Carbon::now()->addDays(3)->format('d-m-Y'),
-            'endDate' => Carbon::now()->addDays(3)->format('d-m-Y'),
+            'startDate' => Carbon::now()->addDays(3)->format('Y-m-d'),
+            'endDate' => Carbon::now()->addDays(3)->format('Y-m-d'),
         ]);
         $this->post('/events', $attributes);
 
         // Event in the past
         $attributes = factory(Event::class)->raw([
             'title'=>'test title 2',
-            'startDate' => Carbon::now()->subDays(3)->format('d-m-Y'),
-            'endDate' => Carbon::now()->subDays(3)->format('d-m-Y'),
+            'startDate' => Carbon::now()->subDays(3)->format('Y-m-d'),
+            'endDate' => Carbon::now()->subDays(3)->format('Y-m-d'),
         ]);
         $this->post('/events', $attributes);