Merge branch 'ACP2E-1521' of https://github.com/magento-l3/magento2ce into PR01262023

chittima · chittima · commit 90a2a7464a2c · 2023-02-01T06:33:50.000-06:00
diff --git a/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php
@@ -93,6 +93,7 @@ public function execute()
                 );
                 return $resultRedirect->setPath('*/*/forgotpassword');
             }
+            $this->session->destroy(['send_expire_cookie']);
             $this->messageManager->addSuccessMessage($this->getSuccessMessage($email));
             return $resultRedirect->setPath('*/*/');
         } else {
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ForgotPasswordPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ForgotPasswordPostTest.php
@@ -147,6 +147,8 @@ public function testExecute()
             ->with('*/*/')
             ->willReturnSelf();
 
+        $this->session->expects($this->once())->method('destroy')->with(['send_expire_cookie']);
+
         $this->controller->execute();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ public function execute()`
`93`	`93`	`);`
`94`	`94`	`return $resultRedirect->setPath('//forgotpassword');`
`95`	`95`	`}`
	`96`	`+ $this->session->destroy(['send_expire_cookie']);`
`96`	`97`	`$this->messageManager->addSuccessMessage($this->getSuccessMessage($email));`
`97`	`98`	`return $resultRedirect->setPath('//');`
`98`	`99`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@ public function testExecute()`
`147`	`147`	`->with('//')`
`148`	`148`	`->willReturnSelf();`
`149`	`149`
	`150`	`+ $this->session->expects($this->once())->method('destroy')->with(['send_expire_cookie']);`
	`151`	`+`
`150`	`152`	`$this->controller->execute();`
`151`	`153`	`}`
`152`	`154`