From 275e1beda28673ed7dafaf2d41216c60bbab46a3 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 8 Apr 2025 13:15:28 -0400
Subject: [PATCH] updating for conflicts and adding test

---
 tests/Unit/UserTest.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php
index 0d2b41a780..f54969a5da 100644
--- a/tests/Unit/UserTest.php
+++ b/tests/Unit/UserTest.php
@@ -24,13 +24,6 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function testLastName()
-    {
-        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'allanovna-romanova-oshostakova';
-        $user = User::generateFormattedNameFromFullName($fullname, 'lastname');
-        $this->assertEquals($expected_username, $user['username']);
-      
     public function testFirstNameEmail()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
@@ -39,6 +32,22 @@ class UserTest extends TestCase
         $this->assertEquals($expected_email, $user['username'] . '@example.com');
     }
 
+    public function testLastName()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'allanovna-romanova-oshostakova';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastname');
+        $this->assertEquals($expected_username, $user['username']);
+    }
+
+    public function testLastNameEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'allanovna-romanova-oshostakova@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastname');
+        $this->assertEquals($expected_username, $user['username'] . '@example.com');
+    }
+
     public function testFirstNameDotLastName()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";