From: Dan Brown <redacted>
Date: Sat, 16 Sep 2023 10:55:57 +0000 (+0100)
Subject: Merge branch 'v23-08' into development
X-Git-Tag: v23.10~1^2~36
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9ac932fc28ac7085eb956c2c217e9b8612462d4a?hp=-c

Merge branch 'v23-08' into development
---

9ac932fc28ac7085eb956c2c217e9b8612462d4a
diff --combined tests/Activity/WatchTest.php
index 5db0067cc,464886155..5b9ae5a4c
--- a/tests/Activity/WatchTest.php
+++ b/tests/Activity/WatchTest.php
@@@ -66,7 -66,7 +66,7 @@@ class WatchTest extends TestCas
  
          $this->actingAs($editor)->get($book->getUrl());
          $resp = $this->put('/watching/update', [
 -            'type' => get_class($book),
 +            'type' => $book->getMorphClass(),
              'id' => $book->id,
              'level' => 'comments'
          ]);
@@@ -81,7 -81,7 +81,7 @@@
          ]);
  
          $resp = $this->put('/watching/update', [
 -            'type' => get_class($book),
 +            'type' => $book->getMorphClass(),
              'id' => $book->id,
              'level' => 'default'
          ]);
@@@ -101,7 -101,7 +101,7 @@@
          $book = $this->entities->book();
  
          $resp = $this->put('/watching/update', [
 -            'type' => get_class($book),
 +            'type' => $book->getMorphClass(),
              'id' => $book->id,
              'level' => 'comments'
          ]);
@@@ -210,16 -210,22 +210,22 @@@
          $prefs = new UserNotificationPreferences($editor);
          $prefs->updateFromSettingsArray(['comment-replies' => 'true']);
  
+         // Create some existing comments to pad IDs to help potentially error
+         // on mis-identification of parent via ids used.
+         Comment::factory()->count(5)
+             ->for($entities['page'], 'entity')
+             ->create(['created_by' => $this->users->admin()->id]);
+ 
          $notifications = Notification::fake();
  
          $this->actingAs($editor)->post("/comment/{$entities['page']->id}", [
              'text' => 'My new comment'
          ]);
-         $comment = $entities['page']->comments()->first();
+         $comment = $entities['page']->comments()->orderBy('id', 'desc')->first();
  
          $this->asAdmin()->post("/comment/{$entities['page']->id}", [
              'text' => 'My new comment response',
-             'parent_id' => $comment->id,
+             'parent_id' => $comment->local_id,
          ]);
          $notifications->assertSentTo($editor, CommentCreationNotification::class);
      }