-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #48161 from nextcloud/fix/pronouns-tests
- Loading branch information
Showing
6 changed files
with
66 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -224,6 +224,11 @@ protected function getDefaultAccountMock(bool $useDefaultValues = true): MockObj | |
| 'Default birthdate', | ||
| IAccountManager::SCOPE_LOCAL, | ||
| ), | ||
| IAccountManager::PROPERTY_PRONOUNS => $this->buildPropertyMock( | ||
| IAccountManager::PROPERTY_PRONOUNS, | ||
| 'Default pronouns', | ||
| IAccountManager::SCOPE_LOCAL, | ||
| ), | ||
| ]; | ||
|
|
||
| $account = $this->createMock(IAccount::class); | ||
|
|
@@ -275,7 +280,7 @@ public function testSetUserSettings($email, $validEmail, $expectedStatus): void | |
| $controller->expects($this->never())->method('saveUserSettings'); | ||
| } | ||
|
|
||
| $result = $controller->setUserSettings(// | ||
| $result = $controller->setUserSettings( | ||
| AccountManager::SCOPE_FEDERATED, | ||
| 'displayName', | ||
| AccountManager::SCOPE_FEDERATED, | ||
|
|
@@ -288,7 +293,13 @@ public function testSetUserSettings($email, $validEmail, $expectedStatus): void | |
| 'street and city', | ||
| AccountManager::SCOPE_FEDERATED, | ||
| '@nextclouders', | ||
| AccountManager::SCOPE_FEDERATED | ||
| AccountManager::SCOPE_FEDERATED, | ||
| '@nextclouders', | ||
| AccountManager::SCOPE_FEDERATED, | ||
| '2020-01-01', | ||
| AccountManager::SCOPE_FEDERATED, | ||
| 'they/them', | ||
| AccountManager::SCOPE_FEDERATED, | ||
| ); | ||
|
|
||
| $this->assertSame($expectedStatus, $result->getStatus()); | ||
|
|
@@ -321,6 +332,10 @@ public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed(): void { | |
| $twitterScope = IAccountManager::SCOPE_PUBLISHED; | ||
| $fediverse = '@[email protected]'; | ||
| $fediverseScope = IAccountManager::SCOPE_PUBLISHED; | ||
| $birtdate = '2020-01-01'; | ||
| $birthdateScope = IAccountManager::SCOPE_PUBLISHED; | ||
| $pronouns = 'she/her'; | ||
| $pronounsScope = IAccountManager::SCOPE_PUBLISHED; | ||
|
|
||
| $user = $this->createMock(IUser::class); | ||
| $user->method('getUID')->willReturn('johndoe'); | ||
|
|
@@ -397,7 +412,11 @@ public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed(): void { | |
| $twitter, | ||
| $twitterScope, | ||
| $fediverse, | ||
| $fediverseScope | ||
| $fediverseScope, | ||
| $birtdate, | ||
| $birthdateScope, | ||
| $pronouns, | ||
| $pronounsScope, | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -436,6 +455,10 @@ public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void { | |
| $twitterScope = IAccountManager::SCOPE_PUBLISHED; | ||
| $fediverse = '@[email protected]'; | ||
| $fediverseScope = IAccountManager::SCOPE_PUBLISHED; | ||
| $birthdate = '2020-01-01'; | ||
| $birthdateScope = IAccountManager::SCOPE_PUBLISHED; | ||
| $pronouns = 'she/her'; | ||
| $pronounsScope = IAccountManager::SCOPE_PUBLISHED; | ||
|
|
||
| // All settings are changed (in the past phone, website, address and | ||
| // twitter were not changed). | ||
|
|
@@ -455,6 +478,10 @@ public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void { | |
| $expectedProperties[IAccountManager::PROPERTY_TWITTER]['scope'] = $twitterScope; | ||
| $expectedProperties[IAccountManager::PROPERTY_FEDIVERSE]['value'] = $fediverse; | ||
| $expectedProperties[IAccountManager::PROPERTY_FEDIVERSE]['scope'] = $fediverseScope; | ||
| $expectedProperties[IAccountManager::PROPERTY_BIRTHDATE]['value'] = $birthdate; | ||
| $expectedProperties[IAccountManager::PROPERTY_BIRTHDATE]['scope'] = $birthdateScope; | ||
| $expectedProperties[IAccountManager::PROPERTY_PRONOUNS]['value'] = $pronouns; | ||
| $expectedProperties[IAccountManager::PROPERTY_PRONOUNS]['scope'] = $pronounsScope; | ||
|
|
||
| $this->mailer->expects($this->once())->method('validateMailAddress') | ||
| ->willReturn(true); | ||
|
|
@@ -478,7 +505,11 @@ public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void { | |
| $twitter, | ||
| $twitterScope, | ||
| $fediverse, | ||
| $fediverseScope | ||
| $fediverseScope, | ||
| $birthdate, | ||
| $birthdateScope, | ||
| $pronouns, | ||
| $pronounsScope, | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -518,6 +549,10 @@ public function testSetUserSettingsSubset($property, $propertyValue): void { | |
| $twitterScope = ($property === 'twitterScope') ? $propertyValue : null; | ||
| $fediverse = ($property === 'fediverse') ? $propertyValue : null; | ||
| $fediverseScope = ($property === 'fediverseScope') ? $propertyValue : null; | ||
| $birthdate = ($property === 'birthdate') ? $propertyValue : null; | ||
| $birthdateScope = ($property === 'birthdateScope') ? $propertyValue : null; | ||
| $pronouns = ($property === 'pronouns') ? $propertyValue : null; | ||
| $pronounsScope = ($property === 'pronounsScope') ? $propertyValue : null; | ||
|
|
||
| /** @var IAccountProperty[]|MockObject[] $expectedProperties */ | ||
| $expectedProperties = $userAccount->getProperties(); | ||
|
|
@@ -554,6 +589,14 @@ public function testSetUserSettingsSubset($property, $propertyValue): void { | |
| case 'fediverseScope': | ||
| $propertyId = IAccountManager::PROPERTY_FEDIVERSE; | ||
| break; | ||
| case 'birthdate': | ||
| case 'birthdateScope': | ||
| $propertyId = IAccountManager::PROPERTY_BIRTHDATE; | ||
| break; | ||
| case 'pronouns': | ||
| case 'pronounsScope': | ||
| $propertyId = IAccountManager::PROPERTY_PRONOUNS; | ||
| break; | ||
| default: | ||
| $propertyId = '404'; | ||
| } | ||
|
|
@@ -585,7 +628,11 @@ public function testSetUserSettingsSubset($property, $propertyValue): void { | |
| $twitter, | ||
| $twitterScope, | ||
| $fediverse, | ||
| $fediverseScope | ||
| $fediverseScope, | ||
| $birthdate, | ||
| $birthdateScope, | ||
| $pronouns, | ||
| $pronounsScope, | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -606,6 +653,10 @@ public function dataTestSetUserSettingsSubset() { | |
| ['twitterScope', IAccountManager::SCOPE_PUBLISHED], | ||
| ['fediverse', '@[email protected]'], | ||
| ['fediverseScope', IAccountManager::SCOPE_PUBLISHED], | ||
| ['birthdate', '2020-01-01'], | ||
| ['birthdateScope', IAccountManager::SCOPE_PUBLISHED], | ||
| ['pronouns', 'he/him'], | ||
| ['pronounsScope', IAccountManager::SCOPE_PUBLISHED], | ||
| ]; | ||
| } | ||
|
|
||
|
|
||
2 changes: 1 addition & 1 deletion
2
apps/settings/tests/UserMigration/assets/account-complex-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"address":{"visibility":"show_users_only"},"avatar":{"visibility":"show_users_only"},"biography":{"visibility":"show"},"displayname":{"visibility":"show"},"fediverse":{"visibility":"show_users_only"},"headline":{"visibility":"show"},"organisation":{"visibility":"show"},"role":{"visibility":"show"},"email":{"visibility":"hide"},"phone":{"visibility":"hide"},"twitter":{"visibility":"show_users_only"},"website":{"visibility":"show_users_only"},"talk":{"visibility":"show"}} | ||
| {"address":{"visibility":"show_users_only"},"avatar":{"visibility":"show_users_only"},"biography":{"visibility":"show"},"displayname":{"visibility":"show"},"fediverse":{"visibility":"show_users_only"},"headline":{"visibility":"show"},"organisation":{"visibility":"show"},"role":{"visibility":"show"},"email":{"visibility":"hide"},"phone":{"visibility":"hide"},"twitter":{"visibility":"show_users_only"},"website":{"visibility":"show_users_only"},"talk":{"visibility":"show"},"birthdate":{"visibility":"show_users_only"},"pronouns":{"visibility":"show"}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"displayname":{"name":"displayname","value":"Steve Smith","scope":"v2-local","verified":"0","verificationData":""},"address":{"name":"address","value":"123 Water St","scope":"v2-local","verified":"0","verificationData":""},"website":{"name":"website","value":"https:\/\/example.org","scope":"v2-local","verified":"0","verificationData":""},"email":{"name":"email","value":"[email protected]","scope":"v2-federated","verified":"1","verificationData":""},"avatar":{"name":"avatar","value":"","scope":"v2-local","verified":"0","verificationData":""},"phone":{"name":"phone","value":"+12178515387","scope":"v2-private","verified":"0","verificationData":""},"twitter":{"name":"twitter","value":"steve","scope":"v2-federated","verified":"0","verificationData":""},"fediverse":{"name":"fediverse","value":"@[email protected]","scope":"v2-federated","verified":"0","verificationData":""},"organisation":{"name":"organisation","value":"Mytery Machine","scope":"v2-private","verified":"0","verificationData":""},"role":{"name":"role","value":"Manager","scope":"v2-private","verified":"0","verificationData":""},"headline":{"name":"headline","value":"I am Steve","scope":"v2-local","verified":"0","verificationData":""},"biography":{"name":"biography","value":"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris porttitor ullamcorper dictum. Sed fermentum ut ligula scelerisque semper. Aliquam interdum convallis tellus eu dapibus. Integer in justo sollicitudin, hendrerit ligula sit amet, blandit sem.\n\nSuspendisse consectetur ultrices accumsan. Quisque sagittis bibendum lectus ut placerat. Mauris tincidunt ornare neque, et pulvinar tortor porttitor eu.","scope":"v2-local","verified":"0","verificationData":""},"birthdate":{"name":"birthdate","value":"","scope":"v2-local","verified":"0","verificationData":""},"profile_enabled":{"name":"profile_enabled","value":"1","scope":"v2-local","verified":"0","verificationData":""},"additional_mail":[{"name":"additional_mail","value":"[email protected]","scope":"v2-published","verified":"0","verificationData":""},{"name":"additional_mail","value":"[email protected]","scope":"v2-local","verified":"0","verificationData":""}]} | ||
| {"displayname":{"name":"displayname","value":"Steve Smith","scope":"v2-local","verified":"0","verificationData":""},"address":{"name":"address","value":"123 Water St","scope":"v2-local","verified":"0","verificationData":""},"website":{"name":"website","value":"https://example.org","scope":"v2-local","verified":"0","verificationData":""},"email":{"name":"email","value":"[email protected]","scope":"v2-federated","verified":"1","verificationData":""},"avatar":{"name":"avatar","value":"","scope":"v2-local","verified":"0","verificationData":""},"phone":{"name":"phone","value":"+12178515387","scope":"v2-private","verified":"0","verificationData":""},"twitter":{"name":"twitter","value":"steve","scope":"v2-federated","verified":"0","verificationData":""},"fediverse":{"name":"fediverse","value":"@[email protected]","scope":"v2-federated","verified":"0","verificationData":""},"organisation":{"name":"organisation","value":"Mytery Machine","scope":"v2-private","verified":"0","verificationData":""},"role":{"name":"role","value":"Manager","scope":"v2-private","verified":"0","verificationData":""},"headline":{"name":"headline","value":"I am Steve","scope":"v2-local","verified":"0","verificationData":""},"biography":{"name":"biography","value":"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris porttitor ullamcorper dictum. Sed fermentum ut ligula scelerisque semper. Aliquam interdum convallis tellus eu dapibus. Integer in justo sollicitudin, hendrerit ligula sit amet, blandit sem.\n\nSuspendisse consectetur ultrices accumsan. Quisque sagittis bibendum lectus ut placerat. Mauris tincidunt ornare neque, et pulvinar tortor porttitor eu.","scope":"v2-local","verified":"0","verificationData":""},"birthdate":{"name":"birthdate","value":"","scope":"v2-local","verified":"0","verificationData":""},"profile_enabled":{"name":"profile_enabled","value":"1","scope":"v2-local","verified":"0","verificationData":""},"pronouns":{"name":"pronouns","value":"they/them","scope":"v2-local","verified":"0","verificationData":""},"additional_mail":[{"name":"additional_mail","value":"[email protected]","scope":"v2-published","verified":"0","verificationData":""},{"name":"additional_mail","value":"[email protected]","scope":"v2-local","verified":"0","verificationData":""}]} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"address":{"visibility":"show_users_only"},"avatar":{"visibility":"show"},"biography":{"visibility":"show"},"displayname":{"visibility":"show"},"fediverse":{"visibility":"show"},"headline":{"visibility":"show"},"organisation":{"visibility":"show"},"role":{"visibility":"show"},"email":{"visibility":"show_users_only"},"phone":{"visibility":"show_users_only"},"twitter":{"visibility":"show"},"website":{"visibility":"show"}} | ||
| {"address":{"visibility":"show_users_only"},"avatar":{"visibility":"show"},"biography":{"visibility":"show"},"displayname":{"visibility":"show"},"fediverse":{"visibility":"show"},"headline":{"visibility":"show"},"organisation":{"visibility":"show"},"role":{"visibility":"show"},"email":{"visibility":"show_users_only"},"phone":{"visibility":"show_users_only"},"twitter":{"visibility":"show"},"website":{"visibility":"show"},"birthdate":{"visibility":"show"},"pronouns":{"visibility":"show"}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"displayname":{"name":"displayname","value":"Emma Jones","scope":"v2-federated","verified":"0","verificationData":""},"address":{"name":"address","value":"920 Grass St","scope":"v2-local","verified":"0","verificationData":""},"website":{"name":"website","value":"","scope":"v2-local","verified":"0","verificationData":""},"email":{"name":"email","value":"","scope":"v2-federated","verified":"1","verificationData":""},"avatar":{"name":"avatar","value":"","scope":"v2-federated","verified":"0","verificationData":""},"phone":{"name":"phone","value":"","scope":"v2-local","verified":"0","verificationData":""},"twitter":{"name":"twitter","value":"","scope":"v2-local","verified":"0","verificationData":""},"fediverse":{"name":"fediverse","value":"","scope":"v2-local","verified":"0","verificationData":""},"organisation":{"name":"organisation","value":"","scope":"v2-local","verified":"0","verificationData":""},"role":{"name":"role","value":"","scope":"v2-local","verified":"0","verificationData":""},"headline":{"name":"headline","value":"","scope":"v2-local","verified":"0","verificationData":""},"biography":{"name":"biography","value":"","scope":"v2-local","verified":"0","verificationData":""},"birthdate":{"name":"birthdate","value":"","scope":"v2-local","verified":"0","verificationData":""},"profile_enabled":{"name":"profile_enabled","value":"1","scope":"v2-local","verified":"0","verificationData":""},"additional_mail":[]} | ||
| {"displayname":{"name":"displayname","value":"Emma Jones","scope":"v2-federated","verified":"0","verificationData":""},"address":{"name":"address","value":"920 Grass St","scope":"v2-local","verified":"0","verificationData":""},"website":{"name":"website","value":"","scope":"v2-local","verified":"0","verificationData":""},"email":{"name":"email","value":"","scope":"v2-federated","verified":"1","verificationData":""},"avatar":{"name":"avatar","value":"","scope":"v2-federated","verified":"0","verificationData":""},"phone":{"name":"phone","value":"","scope":"v2-local","verified":"0","verificationData":""},"twitter":{"name":"twitter","value":"","scope":"v2-local","verified":"0","verificationData":""},"fediverse":{"name":"fediverse","value":"","scope":"v2-local","verified":"0","verificationData":""},"organisation":{"name":"organisation","value":"","scope":"v2-local","verified":"0","verificationData":""},"role":{"name":"role","value":"","scope":"v2-local","verified":"0","verificationData":""},"headline":{"name":"headline","value":"","scope":"v2-local","verified":"0","verificationData":""},"biography":{"name":"biography","value":"","scope":"v2-local","verified":"0","verificationData":""},"birthdate":{"name":"birthdate","value":"","scope":"v2-local","verified":"0","verificationData":""},"profile_enabled":{"name":"profile_enabled","value":"1","scope":"v2-local","verified":"0","verificationData":""},"pronouns":{"name":"pronouns","value":"","scope":"v2-federated","verified":"0","verificationData":""},"additional_mail":[]} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters