starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-02-05 00:29:48 +03:00
Code Issues 409 Packages Projects Releases 10 Wiki Activity

Mentions: Added coverage for mentions search endpoint

Browse Source
This commit is contained in:
Dan Brown
2025-12-17 13:48:20 +00:00
parent 48cdaab690
commit 3d9aba7b1f
2 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Activity/Notifications/Handlers/CommentMentionNotificationHandler.php
View File

@@ -19,11 +19,13 @@ class CommentMentionNotificationHandler extends BaseNotificationHandler
{
public function handle(Activity $activity, Loggable|string $detail, User $user): void
{
$page = $detail->entity;
if (!($detail instanceof Comment) || !($page instanceof Page)) {
if (!($detail instanceof Comment) || !($detail->entity instanceof Page)) {
throw new \InvalidArgumentException("Detail for comment mention notifications must be a comment on a page");
}
/** @var Page $page */
$page = $detail->entity;
$parser = new MentionParser();
$mentionedUserIds = $parser->parseUserIdsFromHtml($detail->html);
$realMentionedUsers = User::whereIn('id', $mentionedUserIds)->get();
@@ -50,6 +52,9 @@ class CommentMentionNotificationHandler extends BaseNotificationHandler
$this->sendNotificationToUserIds(CommentMentionNotification::class, $receivingNotificationsUserIds, $user, $detail, $page);
}
/**
* @param Collection<User> $mentionedUsers
*/
protected function logMentions(Collection $mentionedUsers, Comment $comment, User $fromUser): void
{
$mentions = [];

67
tests/User/UserSearchTest.php
View File

@@ -2,6 +2,7 @@
namespace Tests\User;
use BookStack\Permissions\Permission;
use BookStack\Users\Models\User;
use Tests\TestCase;
@@ -62,4 +63,70 @@ class UserSearchTest extends TestCase
$resp = $this->get('/search/users/select?search=a');
$this->assertPermissionError($resp);
}
public function test_mentions_search_matches_by_name()
{
$viewer = $this->users->viewer();
$editor = $this->users->editor();
$resp = $this->actingAs($editor)->get('/search/users/mention?search=' . urlencode($viewer->name));
$resp->assertOk();
$resp->assertSee($viewer->name);
$resp->assertDontSee($editor->name);
}
public function test_mentions_search_does_not_match_by_email()
{
$viewer = $this->users->viewer();
$resp = $this->asEditor()->get('/search/users/mention?search=' . urlencode($viewer->email));
$resp->assertDontSee($viewer->name);
}
public function test_mentions_search_requires_logged_in_user()
{
$this->setSettings(['app-public' => true]);
$guest = $this->users->guest();
$this->permissions->grantUserRolePermissions($guest, [Permission::CommentCreateAll, Permission::CommentUpdateAll]);
$resp = $this->get('/search/users/mention?search=a');
$this->assertPermissionError($resp);
}
public function test_mentions_search_requires_comment_create_or_update_permission()
{
$viewer = $this->users->viewer();
$editor = $this->users->editor();
$resp = $this->actingAs($viewer)->get('/search/users/mention?search=' . urlencode($editor->name));
$this->assertPermissionError($resp);
$this->permissions->grantUserRolePermissions($viewer, [Permission::CommentCreateAll]);
$resp = $this->actingAs($editor)->get('/search/users/mention?search=' . urlencode($viewer->name));
$resp->assertOk();
$resp->assertSee($viewer->name);
$this->permissions->removeUserRolePermissions($viewer, [Permission::CommentCreateAll]);
$this->permissions->grantUserRolePermissions($viewer, [Permission::CommentUpdateAll]);
$resp = $this->actingAs($editor)->get('/search/users/mention?search=' . urlencode($viewer->name));
$resp->assertOk();
$resp->assertSee($viewer->name);
}
public function test_mentions_search_shows_first_by_name_without_search()
{
/** @var User $firstUser */
$firstUser = User::query()
->orderBy('name', 'asc')
->first();
$resp = $this->asEditor()->get('/search/users/mention');
$resp->assertOk();
$this->withHtml($resp)->assertElementContains('a[data-id]:first-child', $firstUser->name);
}
}