Merge pull request #503 from tighten/ajm/talk-revision-fix

Load current revision for talk.edit route
tighten · Jun 7, 2024 · 7554268 · 7554268
2 parents c2b1445 + fa26941
commit 7554268
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/app/Http/Controllers/TalksController.php b/app/Http/Controllers/TalksController.php
@@ -64,7 +64,7 @@ public function store(SaveTalkRequest $request)
     public function edit($id)
     {
         try {
-            $talk = auth()->user()->talks()->findOrFail($id);
+            $talk = auth()->user()->talks()->withCurrentRevision()->findOrFail($id);
         } catch (Exception $e) {
             Session::flash('error-message', 'Sorry, but that isn\'t a valid URL.');
             Log::error($e);

diff --git a/tests/Feature/TalkTest.php b/tests/Feature/TalkTest.php
@@ -360,4 +360,15 @@ function archived_talks_can_be_deleted()
         $response->assertRedirect('talks');
         $this->assertDatabaseMissing('talks', ['id' => $talk->id]);
     }
+
+    /** @test */
+    public function editing_a_talk(): void
+    {
+        $talk = Talk::factory()->create();
+
+        $response = $this->actingAs($talk->author)
+            ->get(route('talks.edit', $talk));
+
+        $response->assertSuccessful();
+    }
 }