ENGCOM-5971: #23295: Reset Password Confirmation Link Email Not St… #24783

Author: sidolov

app/code/Magento/Customer/Model/EmailNotification.php

@@ -340,7 +340,7 @@ public function passwordReminder(CustomerInterface $customer)
      */
     public function passwordResetConfirmation(CustomerInterface $customer)
     {
-        $storeId = $this->storeManager->getStore()->getId();
+        $storeId = $customer->getStoreId();
         if (!$storeId) {
             $storeId = $this->getWebsiteStoreId($customer);
         }

app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php

@@ -521,7 +521,7 @@ public function testPasswordResetConfirmation()
 
         /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
         $customer = $this->createMock(CustomerInterface::class);
-        $customer->expects($this->any())
+        $customer->expects($this->once())
             ->method('getStoreId')
             ->willReturn($customerStoreId);
         $customer->expects($this->any())
@@ -539,11 +539,6 @@ public function testPasswordResetConfirmation()
             ->method('getStore')
             ->willReturn($this->storeMock);
 
-        $this->storeManagerMock->expects($this->at(1))
-            ->method('getStore')
-            ->with($customerStoreId)
-            ->willReturn($this->storeMock);
-
         $this->customerRegistryMock->expects($this->once())
             ->method('retrieveSecureData')
             ->with($customerId)