AC-1323: Reset Token Improvement.

Author: admanesachin

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerTest.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Customer\Model\ResourceModel;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Customer\Model\Customer as CustomerModel;
+
+/**
+ * Integration test for @see \Magento\Customer\Model\ResourceModel\Customer
+ */
+class CustomerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CustomerModel
+     */
+    private $customerModel;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->customerModel = $this->objectManager->create(CustomerModel::class);
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->customerModel->delete();
+    }
+
+    /**
+     * Test save rp token
+     *
+     * @throws \Exception
+     */
+    public function testSave(): void
+    {
+        $token='randomstring';
+        $email= uniqid()."@example.com";
+
+        $this->customerModel->setData(
+            [
+                'email' => $email,
+                'rp_token' => $token,
+                'firstname'=> 'John',
+                'lastname' => 'Doe'
+            ]
+        )->save();
+
+        $consumerResourceModel = $this->customerModel->getResource();
+
+        $this->assertEquals($token, $this->customerModel->getRpToken());
+        $this->assertNotEquals(
+            $this->customerModel->getRpToken(),
+            $consumerResourceModel->load($this->customerModel, 'rp_token')
+        );
+    }
+}

dev/tests/integration/testsuite/Magento/User/Model/ResourceModel/UserTest.php

@@ -14,6 +14,7 @@
 use Magento\User\Model\ResourceModel\User as UserResourceModel;
 use Magento\User\Model\User;
 use Magento\User\Model\UserFactory;
+use Magento\Framework\Math\Random;
 
 /**
  * @magentoAppArea adminhtml
@@ -35,6 +36,11 @@ class UserTest extends \PHPUnit\Framework\TestCase
      */
     private $userFactory;
 
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @inheritdoc
      */
@@ -43,6 +49,7 @@ protected function setUp(): void
         $this->model = Bootstrap::getObjectManager()->get(UserResourceModel::class);
         $this->userRoleCollectionFactory = Bootstrap::getObjectManager()->get(UserRoleCollectionFactory::class);
         $this->userFactory = Bootstrap::getObjectManager()->get(UserFactory::class);
+        $this->random = Bootstrap::getObjectManager()->get(Random::class);
     }
 
     /**
@@ -113,4 +120,37 @@ public function testGetValidationRulesBeforeSave(): void
         $rules = $this->model->getValidationRulesBeforeSave();
         $this->assertInstanceOf('Zend_Validate_Interface', $rules);
     }
+
+    /**
+     * Test save rp token
+     *
+     * @throws \Exception
+     */
+    public function testSave(): void
+    {
+        $token = 'randomstring';
+        $username = $this->random->getRandomString(6);
+        $email= $username."@example.com";
+
+        $userModel = Bootstrap::getObjectManager()->get(User::class);
+
+        $userModel->setData(
+            [
+                'email' => $email,
+                'rp_token' => $token,
+                'firstname' => 'John',
+                'lastname' => 'Doe',
+                'password' => $this->random->getRandomString(10),
+                'username' => $username
+            ]
+        )->save();
+
+        $userResourceModel = $this->model;
+
+        $this->assertEquals($token, $userModel->getRpToken());
+        $this->assertNotEquals(
+            $userModel->getRpToken(),
+            $userResourceModel->load($userModel, 'rp_token')
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/User/Model/UserTest.php

@@ -489,11 +489,12 @@ public function testBeforeSaveValidationSuccess()
     public function testChangeResetPasswordLinkToken()
     {
         $this->_model->loadByUsername(TestFrameworkBootstrap::ADMIN_NAME);
+        $userId = $this->_model->getId();
         $this->_model->changeResetPasswordLinkToken('test');
         $date = $this->_model->getRpTokenCreatedAt();
         $this->assertNotNull($date);
         $this->_model->save();
-        $this->_model->loadByUsername(TestFrameworkBootstrap::ADMIN_NAME);
+        $this->_model->load($userId);
         $this->assertEquals('test', $this->_model->getRpToken());
         $this->assertEquals(strtotime($date), strtotime($this->_model->getRpTokenCreatedAt()));
     }