Add integration test for customer reset password

Author: fredden

dev/tests/integration/testsuite/Magento/Customer/Controller/CreatePasswordTest.php

@@ -10,8 +10,10 @@
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
 use Magento\Customer\Model\Session;
+use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\Math\Random;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\View\LayoutInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -61,6 +63,7 @@ protected function setUp(): void
         $this->random = $this->objectManager->get(Random::class);
         $this->customerResource = $this->objectManager->get(CustomerResource::class);
         $this->customerRegistry = $this->objectManager->get(CustomerRegistry::class);
+        $this->dateTimeFactory = $this->objectManager->get(DateTimeFactory::class);
         $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
     }
 
@@ -94,4 +97,69 @@ public function testCreatePassword(): void
         $block = $this->layout->getBlock('resetPassword');
         $this->assertEquals($token, $block->getResetPasswordLinkToken());
     }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_with_website.php
+     *
+     * @return void
+     */
+    public function testTokenHasExpired(): void
+    {
+        $defaultWebsite = $this->websiteRepository->get('base')->getId();
+        $customer = $this->customerRegistry->retrieveByEmail('john.doe@magento.com', $defaultWebsite);
+        $this->customerId = $customer->getId();
+        $token = $this->random->getUniqueHash();
+        $tooLongAgo = $this->dateTimeFactory->create()
+            ->sub(\DateInterval::createFromDateString('1 month'))
+            ->format(DateTime::DATETIME_PHP_FORMAT);
+
+        $customer->changeResetPasswordLinkToken($token);
+        $customer->setData('confirmation', 'confirmation');
+        $customerSecure = $this->customerRegistry->retrieveSecureData($this->customerId);
+        $customerSecure->setRpTokenCreatedAt($tooLongAgo);
+        $this->customerResource->save($customer);
+
+        $this->session->setRpToken($token);
+        $this->session->setRpCustomerId($this->customerId);
+
+        $this->dispatch('customer/account/createPassword');
+
+        $this->assertRedirect($this->stringContains('customer/account/forgotpassword'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Your password reset link has expired.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_with_website.php
+     *
+     * @return void
+     */
+    public function testTokenExtendedOnPageLoad(): void
+    {
+        $defaultWebsite = $this->websiteRepository->get('base')->getId();
+        $customer = $this->customerRegistry->retrieveByEmail('john.doe@magento.com', $defaultWebsite);
+        $this->customerId = $customer->getId();
+        $token = $this->random->getUniqueHash();
+        $anHourAgo = $this->dateTimeFactory->create()
+            ->sub(\DateInterval::createFromDateString('1 hour'))
+            ->format(DateTime::DATETIME_PHP_FORMAT);
+
+        $customer->changeResetPasswordLinkToken($token);
+        $customer->setData('confirmation', 'confirmation');
+        $customerSecure = $this->customerRegistry->retrieveSecureData($this->customerId);
+        $customerSecure->setRpTokenCreatedAt($anHourAgo);
+        $this->customerResource->save($customer);
+
+        $this->session->setRpToken($token);
+        $this->session->setRpCustomerId($this->customerId);
+
+        $this->dispatch('customer/account/createPassword');
+        $block = $this->layout->getBlock('resetPassword');
+        $this->assertEquals($token, $block->getResetPasswordLinkToken());
+
+        $customerSecure = $this->customerRegistry->retrieveSecureData($this->customerId);
+        $this->assertNotEquals($anHourAgo, $customerSecure->getRpTokenCreatedAt());
+    }
 }