Skip to content

Commit

Permalink
Merge pull request nextcloud#48161 from nextcloud/fix/pronouns-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@skjnldsv
skjnldsv authored Sep 18, 2024
2 parents 13fce9f + 8fb64b8 commit a1c2a65
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 9 deletions.
61 changes: 56 additions & 5 deletions apps/settings/tests/Controller/UsersControllerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand All @@ -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());
Expand Down Expand Up @@ -321,6 +332,10 @@ public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed(): void {
$twitterScope = IAccountManager::SCOPE_PUBLISHED;
$fediverse = '@nextclouders@floss.social';
$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');
Expand Down Expand Up @@ -397,7 +412,11 @@ public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed(): void {
$twitter,
$twitterScope,
$fediverse,
$fediverseScope
$fediverseScope,
$birtdate,
$birthdateScope,
$pronouns,
$pronounsScope,
);
}

Expand Down Expand Up @@ -436,6 +455,10 @@ public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void {
$twitterScope = IAccountManager::SCOPE_PUBLISHED;
$fediverse = '@nextclouders@floss.social';
$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).
Expand All @@ -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);
Expand All @@ -478,7 +505,11 @@ public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void {
$twitter,
$twitterScope,
$fediverse,
$fediverseScope
$fediverseScope,
$birthdate,
$birthdateScope,
$pronouns,
$pronounsScope,
);
}

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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';
}
Expand Down Expand Up @@ -585,7 +628,11 @@ public function testSetUserSettingsSubset($property, $propertyValue): void {
$twitter,
$twitterScope,
$fediverse,
$fediverseScope
$fediverseScope,
$birthdate,
$birthdateScope,
$pronouns,
$pronounsScope,
);
}

Expand All @@ -606,6 +653,10 @@ public function dataTestSetUserSettingsSubset() {
['twitterScope', IAccountManager::SCOPE_PUBLISHED],
['fediverse', '@nextclouders@floss.social'],
['fediverseScope', IAccountManager::SCOPE_PUBLISHED],
['birthdate', '2020-01-01'],
['birthdateScope', IAccountManager::SCOPE_PUBLISHED],
['pronouns', 'he/him'],
['pronounsScope', IAccountManager::SCOPE_PUBLISHED],
];
}

Expand Down
2 changes: 1 addition & 1 deletion apps/settings/tests/UserMigration/assets/account-complex-config.json
View file
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"}}
2 changes: 1 addition & 1 deletion apps/settings/tests/UserMigration/assets/account-complex.json
View file
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":"steve@example.org","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":"@steve@floss.social","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":"steve@example.com","scope":"v2-published","verified":"0","verificationData":""},{"name":"additional_mail","value":"steve@earth.world","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":"steve@example.org","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":"@steve@floss.social","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":"steve@example.com","scope":"v2-published","verified":"0","verificationData":""},{"name":"additional_mail","value":"steve@earth.world","scope":"v2-local","verified":"0","verificationData":""}]}
2 changes: 1 addition & 1 deletion apps/settings/tests/UserMigration/assets/account-config.json
View file
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"}}
2 changes: 1 addition & 1 deletion apps/settings/tests/UserMigration/assets/account.json
View file
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":[]}
6 changes: 6 additions & 0 deletions tests/lib/Accounts/AccountManagerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,12 @@ public function testAddMissingDefaults(): void {
'name' => IAccountManager::PROPERTY_PROFILE_ENABLED,
'value' => '1',
],

[
'name' => IAccountManager::PROPERTY_PRONOUNS,
'value' => '',
'scope' => IAccountManager::SCOPE_FEDERATED,
],
];
$this->config->expects($this->once())->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn([]);

Expand Down

0 comments on commit a1c2a65

Please sign in to comment.