github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 14:33:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reviewed #4533, formatting and tweaks

Browse Source 
- 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.
This commit is contained in:
Dan Brown 2023-09-13 10:09:33 +01:00
parent 83028f3fbe
commit a452092e40
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Users/Models/User.php
View File

@ -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)) . '…';
}
/**

14
tests/Entity/CommentTest.php
View File

@ -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…');
}
}