Skip to content

Commit 2f4e77d

Browse files
author
Oleksandr Gorkun
committed
MAGETWO-92720: E-mail admin users when a new administrator is created.
1 parent 2817e9c commit 2f4e77d

File tree

1 file changed

+19
-13
lines changed
  • dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml

1 file changed

+19
-13
lines changed

dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\User\Controller\Adminhtml;
77

8+
use Magento\TestFramework\Mail\Template\TransportBuilderMock;
9+
use Magento\TestFramework\Helper\Bootstrap;
10+
811
/**
912
* Test class for \Magento\User\Controller\Adminhtml\Auth
1013
*
@@ -35,7 +38,7 @@ public function testForgotpasswordAction()
3538
$this->dispatch('backend/admin/auth/forgotpassword');
3639
$this->assertRedirect(
3740
$this->equalTo(
38-
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
41+
Bootstrap::getObjectManager()->get(
3942
\Magento\Backend\Helper\Data::class
4043
)->getHomePageUrl()
4144
)
@@ -51,22 +54,25 @@ public function testForgotpasswordAction()
5154
*/
5255
public function testEmailSendForgotPasswordAction()
5356
{
54-
$transportBuilderMock = $this->prepareEmailMock(
55-
1,
56-
'admin_emails_forgot_email_template',
57-
'general'
57+
/** @var TransportBuilderMock $transportMock */
58+
$transportMock = Bootstrap::getObjectManager()->get(
59+
TransportBuilderMock::class
5860
);
59-
$this->addMockToClass($transportBuilderMock, \Magento\User\Model\User::class);
60-
6161
$this->getRequest()->setPostValue('email', 'adminUser@example.com');
6262
$this->dispatch('backend/admin/auth/forgotpassword');
6363
$this->assertRedirect(
6464
$this->equalTo(
65-
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
65+
Bootstrap::getObjectManager()->get(
6666
\Magento\Backend\Helper\Data::class
6767
)->getHomePageUrl()
6868
)
6969
);
70+
$message = $transportMock->getSentMessage();
71+
$this->assertNotEmpty($message);
72+
$this->assertEquals(
73+
__('Password Reset Confirmation for %1', ['John Doe'])->render(),
74+
$message->getSubject()
75+
);
7076
}
7177

7278
/**
@@ -79,13 +85,13 @@ public function testEmailSendForgotPasswordAction()
7985
public function testResetPasswordAction()
8086
{
8187
/** @var $user \Magento\User\Model\User */
82-
$user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
88+
$user = Bootstrap::getObjectManager()->create(
8389
\Magento\User\Model\User::class
8490
)->loadByUsername(
8591
'dummy_username'
8692
);
8793
$this->assertNotEmpty($user->getId(), 'Broken fixture');
88-
$resetPasswordToken = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
94+
$resetPasswordToken = Bootstrap::getObjectManager()->get(
8995
\Magento\User\Helper\Data::class
9096
)->generateResetPasswordLinkToken();
9197
$user->changeResetPasswordLinkToken($resetPasswordToken);
@@ -123,7 +129,7 @@ public function testResetPasswordActionWithDummyToken()
123129
*/
124130
public function testResetPasswordPostAction($password, $passwordConfirmation, $isPasswordChanged)
125131
{
126-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
132+
$objectManager = Bootstrap::getObjectManager();
127133

128134
/** @var $user \Magento\User\Model\User */
129135
$user = $objectManager->create(\Magento\User\Model\User::class);
@@ -203,7 +209,7 @@ public function testResetPasswordPostActionWithDummyToken()
203209
\Magento\Framework\Message\MessageInterface::TYPE_ERROR
204210
);
205211

206-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
212+
$objectManager = Bootstrap::getObjectManager();
207213

208214
/** @var \Magento\Backend\Helper\Data $backendHelper */
209215
$backendHelper = $objectManager->get(\Magento\Backend\Helper\Data::class);
@@ -218,7 +224,7 @@ public function testResetPasswordPostActionWithDummyToken()
218224
*/
219225
public function testResetPasswordPostActionWithInvalidPassword()
220226
{
221-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
227+
$objectManager = Bootstrap::getObjectManager();
222228

223229
$user = $objectManager->create(\Magento\User\Model\User::class);
224230
$user->loadByUsername('dummy_username');

0 commit comments

Comments
 (0)