use end date on single day events (closes #27)

transformstudios · Feb 12, 2020 · cc186e6 · cc186e6
1 parent 868549b
commit cc186e6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Events/Types/SingleDayEvent.php b/Events/Types/SingleDayEvent.php
@@ -21,7 +21,11 @@ public function upcomingDate($after = null): ?Schedule
             return null;
         }
 
-        return Schedule::fromCarbon($this->start());
+        return new Schedule([
+            'date' => $this->start_date,
+            'start_time' => $this->startTime(),
+            'end_time' => $this->endTime(),
+        ]);
     }
 
     public function upcomingDates($limit = 2, $offset = 0): Collection

diff --git a/Events/tests/SingleDayEventsTest.php b/Events/tests/SingleDayEventsTest.php
@@ -130,6 +130,10 @@ public function test_can_generate_next_datetime_if_before()
             carbon('2019-11-27')->setTimeFromTimeString('11:00:00'),
             $this->nonAllDayEvent->upcomingDate(carbon('2019-11-22'))->start()
         );
+        $this->assertEquals(
+            carbon('2019-11-27')->setTimeFromTimeString('12:00:00'),
+            $this->nonAllDayEvent->upcomingDate(carbon('2019-11-22'))->end()
+        );
     }
 
     public function test_returns_start_if_during()