MAGETWO-56126: Login failed after new custom attribute was added

- fixing Authentification backward incompatible and unit test

Author: cpartica

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\ResourceModel\CustomerRepository;
 use Magento\Customer\Model\CustomerAuthUpdate;
 use Magento\Backend\App\ConfigInterface;
@@ -47,7 +48,7 @@ class Authentication implements AuthenticationInterface
     protected $encryptor;
 
     /**
-     * @var CustomerRepository
+     * @var CustomerRepositoryInterface
      */
     protected $customerRepository;
 
@@ -57,14 +58,14 @@ class Authentication implements AuthenticationInterface
     private $customerAuthUpdate;
 
     /**
-     * @param CustomerRepository $customerRepository
+     * @param CustomerRepositoryInterface $customerRepository
      * @param CustomerRegistry $customerRegistry
      * @param ConfigInterface $backendConfig
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param Encryptor $encryptor
      */
     public function __construct(
-        CustomerRepository $customerRepository,
+        CustomerRepositoryInterface $customerRepository,
         CustomerRegistry $customerRegistry,
         ConfigInterface $backendConfig,
         \Magento\Framework\Stdlib\DateTime $dateTime,
@@ -171,7 +172,7 @@ public function authenticate($customerId, $password)
         }
         return true;
     }
-    
+
     /**
      * Get customer authentication update model
      *

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

@@ -55,8 +55,20 @@ class AuthenticationTest extends \PHPUnit_Framework_TestCase
      */
     private $dateTimeMock;
 
+    /**
+     * @var \Magento\Customer\Model\CustomerAuthUpdate | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerAuthUpdate;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManager;
+
     protected function setUp()
     {
+        $this->objectManager = new ObjectManagerHelper($this);
+
         $this->backendConfigMock = $this->getMockBuilder(ConfigInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getValue'])
@@ -98,9 +110,11 @@ protected function setUp()
             false
         );
 
-        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->customerAuthUpdate = $this->getMockBuilder(\Magento\Customer\Model\CustomerAuthUpdate::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->authentication = $objectManagerHelper->getObject(
+        $this->authentication = $this->objectManager->getObject(
             Authentication::class,
             [
                 'customerRegistry' => $this->customerRegistryMock,
@@ -110,6 +124,12 @@ protected function setUp()
                 'dateTime' => $this->dateTimeMock,
             ]
         );
+
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->authentication,
+            'customerAuthUpdate',
+            $this->customerAuthUpdate
+        );
     }
 
     public function testProcessAuthenticationFailureLockingIsDisabled()
@@ -164,16 +184,10 @@ public function testProcessAuthenticationFailureFirstAttempt(
             ->method('retrieveSecureData')
             ->with($customerId)
             ->willReturn($this->customerSecureMock);
-        $customerMock = $this->getMockBuilder(CustomerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('getById')
+        $this->customerAuthUpdate->expects($this->once())
+            ->method('saveAuth')
             ->with($customerId)
-            ->willReturn($customerMock);
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('save')
-            ->with($customerMock);
+            ->willReturnSelf();
 
         $this->customerSecureMock->expects($this->once())->method('getFailuresNum')->willReturn($failureNum);
         $this->customerSecureMock->expects($this->once())
@@ -210,16 +224,10 @@ public function testUnlock()
             ->method('retrieveSecureData')
             ->with($customerId)
             ->willReturn($this->customerSecureMock);
-        $customerMock = $this->getMockBuilder(CustomerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('getById')
+        $this->customerAuthUpdate->expects($this->once())
+            ->method('saveAuth')
             ->with($customerId)
-            ->willReturn($customerMock);
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('save')
-            ->with($customerMock);
+            ->willReturnSelf();
         $this->customerSecureMock->expects($this->once())->method('setFailuresNum')->with(0);
         $this->customerSecureMock->expects($this->once())->method('setFirstFailure')->with(null);
         $this->customerSecureMock->expects($this->once())->method('setLockExpires')->with(null);
@@ -312,9 +320,10 @@ public function testAuthenticate($result)
                 ->with($customerId)
                 ->willReturn($this->customerSecureMock);
 
-            $this->customerRepositoryMock->expects($this->once())
-                ->method('save')
-                ->willReturn($customerMock);
+            $this->customerAuthUpdate->expects($this->once())
+                ->method('saveAuth')
+                ->with($customerId)
+                ->willReturnSelf();
 
             $this->setExpectedException(\Magento\Framework\Exception\InvalidEmailOrPasswordException::class);
             $this->authentication->authenticate($customerId, $password);