tests

Author: edalzell

src/Types/Event.php

@@ -103,14 +103,25 @@ public function toICalendarEvent(string|CarbonInterface $date): ?ICalendarEvent
 
         $immutableDate = $this->toCarbonImmutable($date);
 
-        return ICalendarEvent::create($this->event->title)
+        $iCalEvent = ICalendarEvent::create($this->event->title)
             ->withoutTimezone()
             ->uniqueIdentifier($this->event->id())
             ->startsAt($immutableDate->setTimeFromTimeString($this->startTime()))
-            ->endsAt($immutableDate->setTimeFromTimeString($this->endTime()))
-            ->address($this->location($this->event))
-            ->description($this->event->description)
-            ->url($this->event->link);
+            ->endsAt($immutableDate->setTimeFromTimeString($this->endTime()));
+
+        if (!is_null($location = $this->location($this->event))) {
+            $iCalEvent->address($location);
+        }
+
+        if (!is_null($description = $this->event->description)) {
+            $iCalEvent->description($description);
+        }
+
+        if (!is_null($link = $this->event->link)) {
+            $iCalEvent->url($link);
+        }
+
+        return $iCalEvent;
     }
 
     /**

src/Types/MultiDayEvent.php

@@ -59,13 +59,24 @@ public function toICalendarEvent(string|CarbonInterface $date): ?ICalendarEvent
         $immutableDate = $this->toCarbonImmutable($date);
         $day = $this->getDayFromDate($immutableDate);
 
-        return ICalendarEvent::create($this->event->title)
+        $iCalEvent = ICalendarEvent::create($this->event->title)
             ->uniqueIdentifier($this->event->id())
             ->startsAt($immutableDate->setTimeFromTimeString($day->start()))
-            ->endsAt($immutableDate->setTimeFromTimeString($day->end()))
-            ->address($this->location($this->event))
-            ->description($this->event->description)
-            ->url($this->event->link);
+            ->endsAt($immutableDate->setTimeFromTimeString($day->end()));
+
+        if (! is_null($location = $this->location($this->event))) {
+            $iCalEvent->address($location);
+        }
+
+        if (! is_null($description = $this->event->description)) {
+            $iCalEvent->description($description);
+        }
+
+        if (! is_null($link = $this->event->link)) {
+            $iCalEvent->url($link);
+        }
+
+        return $iCalEvent;
     }
 
     /**

tests/Feature/IcsControllerTest.php

@@ -23,6 +23,8 @@ protected function setUp(): void
                 'start_time' => '11:00',
                 'end_time' => '12:00',
                 'location' => 'The Location',
+                'description' => 'The description',
+                'link' => 'https://transformstudios.com'
             ])->save();
     }
 
@@ -38,6 +40,8 @@ public function can_create_single_day_event_ics_file()
 
         $this->assertStringContainsString('DTSTART:'.now()->setTimeFromTimeString('11:00')->format('Ymd\THis'), $response->streamedContent());
         $this->assertStringContainsString('LOCATION:The Location', $response->streamedContent());
+        $this->assertStringContainsString('DESCRIPTION:The description', $response->streamedContent());
+        $this->assertStringContainsString('URL:https://transformstudios.com', $response->streamedContent());
     }
 
     #[Test]
@@ -55,6 +59,9 @@ public function can_create_single_day_recurring_event_ics_file()
                 'start_time' => '11:00',
                 'end_time' => '12:00',
                 'recurrence' => 'weekly',
+                'location' => 'The Location',
+                'description' => 'The description',
+                'link' => 'https://transformstudios.com'
             ])->save();
 
         $response = $this->get(route('statamic.events.ics.show', [
@@ -63,6 +70,9 @@ public function can_create_single_day_recurring_event_ics_file()
         ]))->assertDownload('recurring-event.ics');
 
         $this->assertStringContainsString('DTSTART:'.now()->setTimeFromTimeString('11:00')->format('Ymd\THis'), $response->streamedContent());
+        $this->assertStringContainsString('LOCATION:The Location', $response->streamedContent());
+        $this->assertStringContainsString('DESCRIPTION:The description', $response->streamedContent());
+        $this->assertStringContainsString('URL:https://transformstudios.com', $response->streamedContent());
 
         $this->get(route('statamic.events.ics.show', [
             'date' => now()->addDay()->toDateString(),
@@ -75,13 +85,16 @@ public function can_create_single_day_multiday_event_ics_file()
     {
         Carbon::setTestNow(now());
 
-        $entry = Entry::make()
+        Entry::make()
             ->slug('multi-day-event')
             ->collection('events')
             ->id('the-multi-day-event')
             ->data([
                 'title' => 'Multi-day Event',
                 'multi_day' => true,
+                'location' => 'The Location',
+                'description' => 'The description',
+                'link' => 'https://transformstudios.com',
                 'days' => [
                     [
                         'date' => now()->toDateString(),
@@ -112,6 +125,10 @@ public function can_create_single_day_multiday_event_ics_file()
         ]))->assertDownload('multi-day-event.ics');
 
         $this->assertStringContainsString('DTSTART:'.now()->addDay()->setTimeFromTimeString('11:00')->format('Ymd\THis'), $response->streamedContent());
+        $this->assertStringContainsString('LOCATION:The Location', $response->streamedContent());
+        $this->assertStringContainsString('DESCRIPTION:The description', $response->streamedContent());
+        $this->assertStringContainsString('URL:https://transformstudios.com', $response->streamedContent());
+
     }
 
     #[Test]