ACP2E-3125: Password reset template issue with Admin user

Author: pradeep1819

app/code/Magento/User/view/adminhtml/email/user_notification.html

@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "New %changes for %user_name" changes=$changes user_name=$user.name}} @-->
+<!--@subject {{trans "New %changes for %user_name" changes=$changes user_name=$user.username}} @-->
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var store_name":"Store Name",
 "var store_email":"Store Email",
 "var store_phone":"Store Phone",
 "var changes":"Changes",
-"var user.name":"User Name"
+"var user.username":"User Name"
 } @-->
 
 {{trans "Hello,"}}

dev/tests/integration/testsuite/Magento/User/Model/UserTest.php

@@ -21,9 +21,13 @@
 use Magento\Framework\Stdlib\DateTime;
 use Magento\TestFramework\Bootstrap as TestFrameworkBootstrap;
 use Magento\TestFramework\Entity;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 use Magento\User\Model\User as UserModel;
+use Magento\User\Test\Fixture\User as UserDataFixture;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -62,6 +66,11 @@ class UserTest extends TestCase
      */
     private $objectManager;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     /**
      * @inheritDoc
      */
@@ -72,6 +81,7 @@ protected function setUp(): void
         $this->_dateTime = $this->objectManager->get(DateTime::class);
         $this->encryptor = $this->objectManager->get(Encryptor::class);
         $this->cache = $this->objectManager->get(CacheInterface::class);
+        $this->fixtures = DataFixtureStorageManager::getStorage();
     }
 
     /**
@@ -618,6 +628,41 @@ public function testSendNotificationEmailsIfRequired()
         );
     }
 
+    /**
+     * Test admin email notification after password change
+     *
+     * @throws LocalizedException
+     * @return void
+     */
+    #[
+        DataFixture(UserDataFixture::class, ['role_id' => 1], 'user')
+    ]
+    public function testAdminUserEmailNotificationAfterPasswordChange(): void
+    {
+        // Load admin user
+        $user = $this->fixtures->get('user');
+        $username = $user->getDataByKey('username');
+        $adminEmail = $user->getDataByKey('email');
+
+        // Login with old credentials
+        $this->_model->login($username, TestFrameworkBootstrap::ADMIN_PASSWORD);
+
+        // Change password
+        $this->_model->setPassword('newPassword123');
+        $this->_model->save();
+
+        $this->_model->sendNotificationEmailsIfRequired();
+
+        /** @var TransportBuilderMock $transportBuilderMock */
+        $transportBuilderMock = $this->objectManager->get(TransportBuilderMock::class);
+        $message = $transportBuilderMock->getSentMessage();
+
+        // Verify an email was dispatched to the correct user with correct subject
+        $this->assertNotNull($transportBuilderMock->getSentMessage());
+        $this->assertEquals($adminEmail, $message->getTo()[0]->getEmail());
+        $this->assertEquals($message->getSubject(), 'New password for '.$username);
+    }
+
     /**
      * Return email template id by origin template code
      *