get all tests passing

Author: edalzell

src/Types/Event.php

@@ -14,7 +14,7 @@
 
 abstract class Event
 {
-    abstract protected function rule(): RRuleInterface;
+    abstract protected function rule(bool $useEnd = false): RRuleInterface;
 
     public function __construct(protected Entry $event) {}
 
@@ -76,7 +76,7 @@ public function occursOnDate(string|CarbonInterface $date): bool
 
     public function nextOccurrences(int $limit = 1): Collection
     {
-        return $this->collect($this->rule()->getOccurrencesAfter(date: now(), inclusive: true, limit: $limit));
+        return $this->collect($this->rule(true)->getOccurrencesAfter(date: now(), inclusive: true, limit: $limit));
     }
 
     public function startTime(): string

src/Types/MultiDayEvent.php

@@ -93,17 +93,8 @@ public function toICalendarEvents(): array
             ->all();
     }
 
-    protected function rule(bool $collapseDays = false): RRuleInterface
+    protected function rule(bool $useEnd = false): RRuleInterface
     {
-        // if we're collapsing, then return an rrule instead of rset and use start of first day to end of last day
-        if ($this->collapseMultiDays) {
-            return new RRule([
-                'count' => 1,
-                'dtstart' => $this->end(),
-                'freq' => RRule::DAILY,
-            ]);
-        }
-
         return tap(
             new RSet,
             fn (RSet $rset) => $this->days->each(fn (Day $day) => $rset->addRRule([

src/Types/RecurringEvent.php

@@ -52,7 +52,7 @@ public function toICalendarEvents(): array
         return [$iCalEvent];
     }
 
-    protected function rule(): RRuleInterface
+    protected function rule(bool $useEnd = false): RRuleInterface
     {
         $rule = [
             'dtstart' => $this->end(),

src/Types/SingleDayEvent.php

@@ -7,11 +7,20 @@
 
 class SingleDayEvent extends Event
 {
-    protected function rule(): RRuleInterface
+    protected function rule(bool $useEnd = false): RRuleInterface
     {
+        if ($useEnd) {
+            return new RRule([
+                'count' => 1,
+                'dtstart' => $this->end(),
+                'freq' => RRule::DAILY,
+            ]);
+        }
+
         return new RRule([
-            'count' => 1,
-            'dtstart' => $this->end(),
+            // 'count' => 1,
+            'dtstart' => $this->start(),
+            'until' => $this->end(),
             'freq' => RRule::DAILY,
         ]);
     }

tests/EventsTest.php

@@ -421,7 +421,7 @@
 
     expect($events1)->toHaveCount(1);
     expect($events2)->toHaveCount(1);
-})->skip();
+});
 
 test('event with timezone offset appears on the correct UTC date', function () {
     $date = CarbonImmutable::createFromDate(2026, 2, 28);

tests/Types/SingleDayEventsTest.php

@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
 use Carbon\CarbonTimeZone;
+use Illuminate\Support\Facades\Date;
 use Statamic\Facades\Entry;
 use TransformStudios\Events\EventFactory;
 use TransformStudios\Events\Types\SingleDayEvent;
@@ -146,36 +147,35 @@
 });
 
 it('queries occurrences based on timezone', function () {
-    $utcDate = now('UTC')->setTimeFromTimeString('11:00')->toImmutable();
-    $laDate = now('America/Los_Angeles')->setTimeFromTimeString('11:00')->toImmutable();
+    $utcDate = Date::parse('2026-03-26 11am')->toImmutable();
+    $laDate = $utcDate->shiftTimezone('America/Los_Angeles');
 
     $entry = makeEvent([
-        'start_date' => $utcDate->toDateString(),
+        'start_date' => '2026-03-26',
         'timezone' => 'America/Los_Angeles',
-        'start_time' => '22:00',
+        'start_time' => '05:00',
         'end_time' => '23:00',
     ]);
 
     $events1 = EventFactory::createFromEntry($entry)->occurrencesBetween($utcDate->startOfDay(), $utcDate->endOfDay());
     $events2 = EventFactory::createFromEntry($entry)->occurrencesBetween($laDate->startOfDay(), $laDate->endOfDay());
 
-    expect($events1)->toHaveCount(0);
+    expect($events1)->toHaveCount(1);
     expect($events2)->toHaveCount(1);
 });
 
-it('retrieves occurrences that span days', function () {
-    $date = CarbonImmutable::createFromDate(2026, 2, 28);
+it('retrieves occurrences that span days in different timezone than event', function ($from, $to, $count) {
     $entry = Entry::make()
         ->collection('events')
         ->data([
-            'start_date' => $date->toDateString(),
+            'start_date' => now()->toDateString(),
             'timezone' => 'America/Los_Angeles',
             'start_time' => '05:00',
             'end_time' => '23:00',
         ]);
 
-    $events1 = EventFactory::createFromEntry($entry)->occurrencesBetween($date->startOfMonth(), $date->endOfMonth());
-    // $events2 = EventFactory::createFromEntry($entry)->occurrencesBetween($date->startOfMonth(), $date->endOfMonth()->endOfWeek());
-
-    expect($events1)->toHaveCount(1);
-})->skip();
+    expect(EventFactory::createFromEntry($entry))->occurrencesBetween($from, $to)->toHaveCount($count);
+})->with([
+    [now()->startOfDay(), now()->endOfDay()->addDay(), 1],
+    [now()->startOfDay(), now()->endOfDay(), 1],
+]);