Merge remote-tracking branch 'origin/ENGCOM-1254-magento-magento2-14621' into 2.3-develop-prs

Stanislav Idolov · Stanislav Idolov · commit 78479267729e · 2018-04-17T17:23:15.000+03:00
diff --git a/app/code/Magento/User/Test/Unit/Model/UserTest.php b/app/code/Magento/User/Test/Unit/Model/UserTest.php
@@ -782,7 +782,7 @@ public function testPerformIdentityCheck($verifyIdentityResult, $lockExpires)
             $this->expectExceptionMessage((string)__('Your account is temporarily disabled. Please try again later.'));
         }
 
-        if (!$verifyIdentityResult) {
+        if (!$lockExpires && !$verifyIdentityResult) {
             $this->expectException(\Magento\Framework\Exception\AuthenticationException::class);
             $this->expectExceptionMessage(
                 (string)__('The password entered for the current user is invalid. Verify the password and try again.')

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ public function testPerformIdentityCheck($verifyIdentityResult, $lockExpires)`
`782`	`782`	`$this->expectExceptionMessage((string)__('Your account is temporarily disabled. Please try again later.'));`
`783`	`783`	`}`
`784`	`784`
`785`		`- if (!$verifyIdentityResult) {`
	`785`	`+ if (!$lockExpires && !$verifyIdentityResult) {`
`786`	`786`	`$this->expectException(\Magento\Framework\Exception\AuthenticationException::class);`
`787`	`787`	`$this->expectExceptionMessage(`
`788`	`788`	`(string)__('The password entered for the current user is invalid. Verify the password and try again.')`