cleanup

Author: steven-fox

app/Livewire/MobilePricing.php

@@ -12,10 +12,10 @@
 class MobilePricing extends Component
 {
     protected $listeners = [
-        'email-submitted' => 'handleEmailSubmitted',
+        'purchase-request-submitted' => 'handlePurchaseRequest',
     ];
 
-    public function handleEmailSubmitted(array $data)
+    public function handlePurchaseRequest(array $data)
     {
         $user = $this->findOrCreateUser($data['email']);
 
@@ -24,15 +24,11 @@ public function handleEmailSubmitted(array $data)
 
     public function createCheckoutSession(string $plan, ?User $user = null)
     {
-        $user ??= Auth::user();
-
-        if (! $user) {
+        if (! ($user ??= Auth::user())) {
             return;
         }
 
-        $subscription = Subscription::tryFrom($plan);
-
-        if (! $subscription) {
+        if (! ($subscription = Subscription::tryFrom($plan))) {
             return;
         }
 
@@ -60,7 +56,14 @@ private function findOrCreateUser(string $email): User
 
     private function successUrl(): string
     {
-        return Str::replace('abc', '{CHECKOUT_SESSION_ID}', route('order.success', ['checkoutSessionId' => 'abc']));
+        // This is a hack to get the route() function to work. If you try
+        // to pass {CHECKOUT_SESSION_ID} to the route function, it will
+        // throw an error.
+        return Str::replace(
+            'abc',
+            '{CHECKOUT_SESSION_ID}',
+            route('order.success', ['checkoutSessionId' => 'abc'])
+        );
     }
 
     public function render()

app/Livewire/PurchaseModal.php

@@ -2,6 +2,7 @@
 
 namespace App\Livewire;
 
+use Livewire\Attributes\Renderless;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
@@ -18,10 +19,10 @@ class PurchaseModal extends Component
         'email' => 'required|email',
     ];
 
-    public function openModal($plan): void
+    #[Renderless]
+    public function setPlan(string $plan): void
     {
         $this->selectedPlan = $plan;
-        $this->showModal = true;
     }
 
     public function closeModal(): void
@@ -31,11 +32,11 @@ public function closeModal(): void
         $this->resetValidation();
     }
 
-    public function emitEmail()
+    public function submit(): void
     {
         $this->validate();
 
-        $this->dispatch('email-submitted', [
+        $this->dispatch('purchase-request-submitted', [
             'email' => $this->email,
             'plan' => $this->selectedPlan,
         ]);

resources/views/livewire/purchase-modal.blade.php

@@ -2,12 +2,10 @@
     <div
         x-data="{
             open: @entangle('showModal'),
-            selectedPlan: @entangle('selectedPlan'),
         }"
         @open-purchase-modal.window="
             open = true;
-            selectedPlan = $event.detail.plan;
-            $wire.openModal($event.detail.plan);
+            $wire.setPlan($event.detail.plan);
         "
     >
         <!-- Modal Backdrop -->
@@ -23,7 +21,6 @@ class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
             x-cloak
         ></div>
 
-        <!-- Modal Content -->
         <div
             x-show="open"
             x-transition:enter="transition duration-300 ease-out"
@@ -49,7 +46,7 @@ class="w-full max-w-md rounded-2xl bg-white p-8 shadow-xl dark:bg-mirage"
                 </div>
 
                 <form
-                    wire:submit.prevent="emitEmail"
+                    wire:submit.prevent="submit"
                     class="space-y-8"
                 >
                     <div>

tests/Feature/Livewire/PurchaseModalTest.php

@@ -3,22 +3,18 @@
 namespace Tests\Feature\Livewire;
 
 use App\Livewire\PurchaseModal;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class PurchaseModalTest extends TestCase
 {
-    use RefreshDatabase;
-
     #[Test]
-    public function purchase_modal_can_be_opened_with_plan()
+    public function purchase_modal_can_set_a_plan()
     {
         Livewire::test(PurchaseModal::class)
-            ->call('openModal', 'mini')
-            ->assertSet('selectedPlan', 'mini')
-            ->assertSet('showModal', true);
+            ->call('setPlan', 'mini')
+            ->assertSet('selectedPlan', 'mini');
     }
 
     #[Test]
@@ -38,30 +34,28 @@ public function purchase_modal_can_be_closed()
     public function purchase_modal_validates_email()
     {
         Livewire::test(PurchaseModal::class)
-            ->call('openModal', 'mini')
             ->set('email', 'invalid-email')
-            ->call('emitEmail')
+            ->call('submit')
             ->assertHasErrors(['email' => 'email']);
     }
 
     #[Test]
     public function purchase_modal_requires_email()
     {
         Livewire::test(PurchaseModal::class)
-            ->call('openModal', 'mini')
             ->set('email', '')
-            ->call('emitEmail')
+            ->call('submit')
             ->assertHasErrors(['email' => 'required']);
     }
 
     #[Test]
-    public function purchase_modal_emits_event_with_valid_email()
+    public function test_submit_action()
     {
         Livewire::test(PurchaseModal::class)
-            ->call('openModal', 'mini')
+            ->call('setPlan', 'mini')
             ->set('email', '[email protected]')
-            ->call('emitEmail')
-            ->assertDispatched('email-submitted', [
+            ->call('submit')
+            ->assertDispatched('purchase-request-submitted', [
                 'email' => '[email protected]',
                 'plan' => 'mini',
             ]);
@@ -71,25 +65,9 @@ public function purchase_modal_emits_event_with_valid_email()
     public function purchase_modal_closes_after_emitting_event()
     {
         Livewire::test(PurchaseModal::class)
-            ->call('openModal', 'mini')
+            ->call('setPlan', 'mini')
             ->set('email', '[email protected]')
-            ->call('emitEmail')
+            ->call('submit')
             ->assertSet('showModal', false);
     }
-
-    #[Test]
-    public function purchase_modal_can_be_opened_via_alpine_event()
-    {
-        $component = Livewire::test(PurchaseModal::class);
-
-        // Simulate the Alpine.js event
-        $component->dispatch('open-purchase-modal', ['plan' => 'pro'])
-            ->assertDispatched('open-purchase-modal');
-
-        // Since we can't directly test Alpine.js event handling in PHPUnit,
-        // we'll verify that the openModal method works as expected
-        $component->call('openModal', 'pro')
-            ->assertSet('selectedPlan', 'pro')
-            ->assertSet('showModal', true);
-    }
 }