Skip to content

Commit 0524dcf

Browse files
committed
MC-31310: Customer configuration: Password options
1 parent 87bb155 commit 0524dcf

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

dev/tests/integration/testsuite/Magento/Customer/Model/EmailNotificationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
use Magento\TestFramework\Mail\Template\TransportBuilderMock;
2222
use PHPUnit\Framework\TestCase;
2323

24-
2524
/**
2625
* Test for customer email notification model.
2726
*
2827
* @see \Magento\Customer\Model\EmailNotification
2928
* @magentoDbIsolation enabled
29+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3030
*/
3131
class EmailNotificationTest extends TestCase
3232
{

dev/tests/integration/testsuite/Magento/Security/_files/customer_reset_password.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
*/
66
declare(strict_types=1);
77

8+
use Magento\Framework\Module\Manager;
89
use Magento\Framework\Stdlib\DateTime;
910
use Magento\Security\Model\PasswordResetRequestEvent;
1011
use Magento\Security\Model\PasswordResetRequestEventFactory;
1112
use Magento\Security\Model\ResourceModel\PasswordResetRequestEvent as PasswordResetRequestEventResource;
1213
use Magento\TestFramework\Helper\Bootstrap;
1314

14-
if ($this->moduleManager->isEnabled('Magento_Customer')) {
15+
$objectManager = Bootstrap::getObjectManager();
16+
/** @var Manager $moduleManager */
17+
$moduleManager = $objectManager->get(Manager::class);
18+
//This check is needed because Magento_Security independent of Magento_Customer
19+
if ($moduleManager->isEnabled('Magento_Customer')) {
1520
require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
1621

17-
$objectManager = Bootstrap::getObjectManager();
1822
/** @var PasswordResetRequestEventFactory $passwordResetRequestEventFactory */
1923
$passwordResetRequestEventFactory = $objectManager->get(PasswordResetRequestEventFactory::class);
2024
/** @var PasswordResetRequestEventResource $passwordResetRequestEventResource */

dev/tests/integration/testsuite/Magento/Security/_files/customer_reset_password_rollback.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55
*/
66
declare(strict_types=1);
77

8+
use Magento\Framework\Module\Manager;
89
use Magento\Framework\Stdlib\DateTime;
910
use Magento\Security\Model\ResourceModel\PasswordResetRequestEvent;
1011
use Magento\TestFramework\Helper\Bootstrap;
1112

12-
if ($this->moduleManager->isEnabled('Magento_Customer')) {
13+
$objectManager = Bootstrap::getObjectManager();
14+
/** @var Manager $moduleManager */
15+
$moduleManager = $objectManager->get(Manager::class);
16+
//This check is needed because Magento_Security independent of Magento_Customer
17+
if ($moduleManager->isEnabled('Magento_Customer')) {
1318
require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
1419

15-
$objectManager = Bootstrap::getObjectManager();
1620
/** @var PasswordResetRequestEvent $passwordResetRequestEventResource */
1721
$passwordResetRequestEventResource = $objectManager->get(PasswordResetRequestEvent::class);
1822
$dateTime = new DateTimeImmutable();

0 commit comments

Comments
 (0)