github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-23 04:34:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Comments: Fixed missing comment timestamps

Browse Source 
Due to deleted code during Laravel 11 upgrade.
Added test to cover.
Closes
This commit is contained in:
Dan Brown 2025-03-30 17:36:48 +01:00
parent 0ec0913846
commit 802f69cf35
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 18 additions and 1 deletions
resources/views/comments
comment.blade.php
tests/Entity
CommentTest.php

2
resources/views/comments/comment.blade.php

@ -24,7 +24,7 @@
@else
{{ trans('common.deleted_user') }}
@endif
<span title="{{ $comment->created_at }}">&nbsp;{{ trans('entities.comment_created', ['createDiff' => $comment->created]) }}</span>
<span title="{{ $comment->created_at }}">&nbsp;{{ trans('entities.comment_created', ['createDiff' => $comment->created_at->diffForHumans() ]) }}</span>
@if($comment->isUpdated())
<span class="mx-xs">&bull;</span>
<span title="{{ trans('entities.comment_updated', ['updateDiff' => $comment->updated_at, 'username' => $comment->updatedBy->name ?? trans('common.deleted_user')]) }}">

17
tests/Entity/CommentTest.php

@ -214,4 +214,21 @@ class CommentTest extends TestCase
$resp->assertSee('window.editor_translations', false);
$resp->assertSee('component="entity-selector"', false);
}
public function test_comment_displays_relative_times()
{
$page = $this->entities->page();
$comment = Comment::factory()->create(['entity_id' => $page->id, 'entity_type' => $page->getMorphClass()]);
$comment->created_at = now()->subWeek();
$comment->updated_at = now()->subDay();
$comment->save();
$pageResp = $this->asAdmin()->get($page->getUrl());
$html = $this->withHtml($pageResp);
// Create date shows relative time as text to user
$html->assertElementContains('.comment-box', 'commented 1 week ago');
// Updated indicator has full time as title
$html->assertElementContains('.comment-box span[title^="Updated ' . $comment->updated_at->format('Y-m-d') . '"]', 'Updated');
}
}