From: Dan Brown <redacted>
Date: Wed, 13 Sep 2023 09:09:33 +0000 (+0100)
Subject: Reviewed #4533, formatting and tweaks
X-Git-Tag: v23.10~1^2~40^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a452092e40110c5251c9b621593f3fa174680059

Reviewed #4533, formatting and tweaks

- Updating formatting.
- Tweaked truncation to roughly match elipsis char to width used.
- Updated testing to use existing helpers, and ran check as admin user
  to avoid name conflicts.
---

diff --git a/app/Users/Models/User.php b/app/Users/Models/User.php
index 3efbeec70..2479521a2 100644
--- a/app/Users/Models/User.php
+++ b/app/Users/Models/User.php
@@ -345,7 +345,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             return $splitName[0];
         }
 
-        return mb_substr($this->name, 0, $chars-3) . '…';
+        return mb_substr($this->name, 0, max($chars - 2, 0)) . '…';
     }
 
     /**
diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index d2ed35136..23fc68197 100644
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -154,18 +154,14 @@ class CommentTest extends TestCase
     }
 
     public function test_comment_creator_name_truncated()
-    {   
-        $longNamedUser = $this->users->admin();
-        $longNamedUser->name = 'Wolfeschlegelsteinhausenbergerdorff';
-        $longNamedUser->save();
-        $this->actingAs($longNamedUser);
-
+    {
+        [$longNamedUser] = $this->users->newUserWithRole(['name' => 'Wolfeschlegelsteinhausenbergerdorff'], ['comment-create-all', 'page-view-all']);
         $page = $this->entities->page();
 
         $comment = Comment::factory()->make();
-        $this->postJson("/comment/$page->id", $comment->getAttributes());
+        $this->actingAs($longNamedUser)->postJson("/comment/$page->id", $comment->getAttributes());
 
-        $pageResp = $this->get($page->getUrl());
-        $pageResp->assertSee('Wolfeschlegel…');
+        $pageResp = $this->asAdmin()->get($page->getUrl());
+        $pageResp->assertSee('Wolfeschlegels…');
     }
 }