jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix user-email validation (#2004)

Browse Source
This commit is contained in:
Kevin Papst
2020-09-30 18:38:34 +02:00
committed by GitHub
parent 145116f657
commit de0a9f8303
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Form/UserCreateType.php
View File

@@ -56,7 +56,7 @@ class UserCreateType extends UserEditType
parent::configureOptions($resolver); parent::configureOptions($resolver);
$resolver->setDefaults([ $resolver->setDefaults([
'validation_groups' => ['UserCreate'], 'validation_groups' => ['UserCreate', 'Registration'],
'include_add_more' => false, 'include_add_more' => false,
]); ]);
} }

4
tests/Controller/UserControllerTest.php
View File

@@ -239,9 +239,11 @@ class UserControllerTest extends ControllerBaseTest
] ]
], ],
[ [
'#user_create_username',
'#user_create_username', '#user_create_username',
'#user_create_plainPassword_first', '#user_create_plainPassword_first',
'#user_create_email', '#user_create_email',
'#user_create_email',
] ]
], ],
// invalid fields: username, password, email, enabled // invalid fields: username, password, email, enabled
@@ -257,9 +259,11 @@ class UserControllerTest extends ControllerBaseTest
] ]
], ],
[ [
'#user_create_username',
'#user_create_username', '#user_create_username',
'#user_create_plainPassword_first', '#user_create_plainPassword_first',
'#user_create_email', '#user_create_email',
'#user_create_email',
] ]
], ],
// invalid fields: password (too short) // invalid fields: password (too short)

8
tests/Timesheet/DateTimeFactoryTest.php
View File

@@ -113,11 +113,10 @@ class DateTimeFactoryTest extends TestCase
$this->assertEquals(29, $dateTime->format('d')); $this->assertEquals(29, $dateTime->format('d'));
$this->assertEquals(7, $dateTime->format('N')); $this->assertEquals(7, $dateTime->format('N'));
$this->assertEquals('Sunday', $dateTime->format('l')); $this->assertEquals('Sunday', $dateTime->format('l'));
$this->assertEquals($expected->format('m'), $dateTime->format('m')); $this->assertEquals('07', $dateTime->format('m'));
$this->assertEquals($expected->format('Y'), $dateTime->format('Y')); $this->assertEquals('2018', $dateTime->format('Y'));
$this->assertEquals(self::TEST_TIMEZONE, $dateTime->getTimezone()->getName()); $this->assertEquals(self::TEST_TIMEZONE, $dateTime->getTimezone()->getName());
$expected = new DateTime('now', new DateTimeZone(self::TEST_TIMEZONE));
$dateTime = $sut->getEndOfWeek(); $dateTime = $sut->getEndOfWeek();
$this->assertEquals(23, $dateTime->format('H')); $this->assertEquals(23, $dateTime->format('H'));
@@ -125,8 +124,7 @@ class DateTimeFactoryTest extends TestCase
$this->assertEquals(59, $dateTime->format('s')); $this->assertEquals(59, $dateTime->format('s'));
$this->assertEquals(7, $dateTime->format('N')); $this->assertEquals(7, $dateTime->format('N'));
$this->assertEquals('Sunday', $dateTime->format('l')); $this->assertEquals('Sunday', $dateTime->format('l'));
$this->assertEquals($expected->format('m'), $dateTime->format('m')); // month and year can be different when the week started at the end of the month
$this->assertEquals($expected->format('Y'), $dateTime->format('Y'));
$this->assertEquals(self::TEST_TIMEZONE, $dateTime->getTimezone()->getName()); $this->assertEquals(self::TEST_TIMEZONE, $dateTime->getTimezone()->getName());
} }