Skip to content

Commit 4169f12

Browse files
committed
ACP2E-328: [Magento Cloud] - Help Investigate why gender values in customer_entity table is different from the gender values in eav_attribute_option
1 parent 6856133 commit 4169f12

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ protected function _validateInputRule($value)
464464
case 'date':
465465
$validator = new Date(
466466
[
467-
'format' => \Magento\Framework\Stdlib\DateTime::DATE_PHP_FORMAT,
467+
'format' => \Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT,
468468
'locale' => $this->_localeResolver->getLocale(),
469469
]
470470
);

dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ public function testValidateResetPasswordLinkTokenExpired()
321321
$this->expectException(\Magento\Framework\Exception\State\ExpiredException::class);
322322

323323
$resetToken = 'lsdj579slkj5987slkj595lkj';
324-
$this->setResetPasswordData($resetToken, '1970-01-01');
324+
$this->setResetPasswordData($resetToken, '1970-01-01 00:00:00');
325325
$this->accountManagement->validateResetPasswordLinkToken(1, $resetToken);
326326
}
327327

@@ -372,7 +372,7 @@ public function testResetPasswordTokenSecondTime()
372372
$resetToken = 'lsdj579slkj5987slkj595lkj';
373373
$password = 'new_Password123';
374374
$email = 'customer@example.com';
375-
$this->setResetPasswordData($resetToken, 'Y-m-d H:i');
375+
$this->setResetPasswordData($resetToken, 'Y-m-d H:i:s');
376376
$this->assertTrue($this->accountManagement->resetPassword($email, $resetToken, $password));
377377
$this->accountManagement->resetPassword($email, $resetToken, $password);
378378
}
@@ -465,7 +465,7 @@ public function testResetPasswordTokenExpired()
465465
$resetToken = 'lsdj579slkj5987slkj595lkj';
466466
$password = 'new_Password123';
467467

468-
$this->setResetPasswordData($resetToken, '1970-01-01');
468+
$this->setResetPasswordData($resetToken, '1970-01-01 00:00:00');
469469
try {
470470
$this->accountManagement->resetPassword('customer@example.com', $resetToken, $password);
471471
$this->fail('Expected exception not thrown.');

0 commit comments

Comments
 (0)