MC-31310: Customer configuration: Password options

Author: dimonovp

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

@@ -74,7 +74,7 @@ protected function setUp()
         $this->emailNotification = $this->objectManager->get(EmailNotificationInterface::class);
         $this->transportBuilder = $this->objectManager->get(TransportBuilderMock::class);
         $this->templateResource = $this->objectManager->get(TemplateResource::class);
-        $this->templateFactory = $this->objectManager->create(TemplateFactory::class);
+        $this->templateFactory = $this->objectManager->get(TemplateFactory::class);
         $this->mutableScopeConfig = $this->objectManager->get(MutableScopeConfigInterface::class);
         $this->templateCollectionFactory = $this->objectManager->get(CollectionFactory::class);
     }

dev/tests/integration/testsuite/Magento/Security/Model/Plugin/AccountManagementTest.php

@@ -89,10 +89,12 @@ public function testPluginIsRegistered(): void
      */
     public function testMaxNumberPasswordResetRequests(): void
     {
-        $email = '[email protected]';
         $this->prepareServerParameters();
         $this->expectExceptionObject(new SecurityViolationException($this->errorMessage));
-        $this->accountManagement->initiatePasswordReset($email, CustomerAccountManagement::EMAIL_REMINDER);
+        $this->accountManagement->initiatePasswordReset(
+            '[email protected]',
+            CustomerAccountManagement::EMAIL_REMINDER
+        );
     }
 
     /**
@@ -103,10 +105,12 @@ public function testMaxNumberPasswordResetRequests(): void
      */
     public function testTimeBetweenPasswordResetRequests(): void
     {
-        $email = '[email protected]';
         $this->prepareServerParameters();
         $this->expectExceptionObject(new SecurityViolationException($this->errorMessage));
-        $this->accountManagement->initiatePasswordReset($email, CustomerAccountManagement::EMAIL_REMINDER);
+        $this->accountManagement->initiatePasswordReset(
+            '[email protected]',
+            CustomerAccountManagement::EMAIL_REMINDER
+        );
     }
 
     /**
@@ -118,11 +122,12 @@ public function testTimeBetweenPasswordResetRequests(): void
      */
     public function testPasswordResetProtectionTypeDisabled(): void
     {
-        $email = '[email protected]';
         $this->prepareServerParameters();
-        $this->assertTrue(
-            $this->accountManagement->initiatePasswordReset($email, CustomerAccountManagement::EMAIL_REMINDER)
+        $result = $this->accountManagement->initiatePasswordReset(
+            '[email protected]',
+            CustomerAccountManagement::EMAIL_REMINDER
         );
+        $this->assertTrue($result);
     }
 
     /**
@@ -134,10 +139,12 @@ public function testPasswordResetProtectionTypeDisabled(): void
      */
     public function testPasswordResetProtectionTypeByIpAndEmail(): void
     {
-        $email = '[email protected]';
         $this->prepareServerParameters();
         $this->expectExceptionObject(new SecurityViolationException($this->errorMessage));
-        $this->accountManagement->initiatePasswordReset($email, CustomerAccountManagement::EMAIL_REMINDER);
+        $this->accountManagement->initiatePasswordReset(
+            '[email protected]',
+            CustomerAccountManagement::EMAIL_REMINDER
+        );
     }
 
     /**
@@ -150,10 +157,12 @@ public function testPasswordResetProtectionTypeByIpAndEmail(): void
     public function testPasswordResetProtectionTypeByIp(): void
     {
         $this->markTestSkipped('Test blocked by issue MC-32988.');
-        $email = '[email protected]';
         $this->prepareServerParameters();
         $this->expectExceptionObject(new SecurityViolationException($this->errorMessage));
-        $this->accountManagement->initiatePasswordReset($email, CustomerAccountManagement::EMAIL_REMINDER);
+        $this->accountManagement->initiatePasswordReset(
+            '[email protected]',
+            CustomerAccountManagement::EMAIL_REMINDER
+        );
     }
 
     /**
@@ -165,10 +174,12 @@ public function testPasswordResetProtectionTypeByIp(): void
      */
     public function testPasswordResetProtectionTypeByEmail(): void
     {
-        $email = '[email protected]';
         $this->prepareServerParameters();
         $this->expectExceptionObject(new SecurityViolationException($this->errorMessage));
-        $this->accountManagement->initiatePasswordReset($email, CustomerAccountManagement::EMAIL_REMINDER);
+        $this->accountManagement->initiatePasswordReset(
+            '[email protected]',
+            CustomerAccountManagement::EMAIL_REMINDER
+        );
     }
 
     /**