Comments: Fixed missing comment timestamps

Due to deleted code during Laravel 11 upgrade.
Added test to cover.
Closes #5555

diff --git a/resources/views/comments/comment.blade.php b/resources/views/comments/comment.blade.php
index b507a810bb1963319154b4c436c164e83e6f7ed1..2bf89d6832df70175a2d899079513de93935d43f 100644 (file)
--- a/resources/views/comments/comment.blade.php
+++ b/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')]) }}">

diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 73136235ce07cb8645d0cfbfad44c15bd4def3cc..9e019e3d1485d99f6924422cd30a25bc130461c7 100644 (file)
--- a/tests/Entity/CommentTest.php
+++ b/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');
+    }
 }