diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-10-23 20:12:32 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-10-23 20:12:32 +0200 |
| commit | 6d2c63ecffd86556a94458f6d57c7ae6abf26fb9 (patch) | |
| tree | 80ab0229e8fbc19fdd19b427ca23455f8b8dd07f /apps/settings/tests | |
| parent | c00d49bb5517b8bb9c9843cbebe13c182deed0a3 (diff) | |
| download | nextcloud-server-6d2c63ecffd86556a94458f6d57c7ae6abf26fb9.tar.gz nextcloud-server-6d2c63ecffd86556a94458f6d57c7ae6abf26fb9.zip | |
fix(settings): Do not use `null` on `string` parameter for sharing disclaimer
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'apps/settings/tests')
| -rw-r--r-- | apps/settings/tests/Settings/Admin/SharingTest.php | 182 |
1 files changed, 94 insertions, 88 deletions
diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php index 9db7a257806..5fcc153b6dd 100644 --- a/apps/settings/tests/Settings/Admin/SharingTest.php +++ b/apps/settings/tests/Settings/Admin/SharingTest.php @@ -20,9 +20,9 @@ use Test\TestCase; class SharingTest extends TestCase { /** @var Sharing */ private $admin; - /** @var IConfig */ + /** @var IConfig&MockObject */ private $config; - /** @var IL10N|MockObject */ + /** @var IL10N&MockObject */ private $l10n; /** @var IManager|MockObject */ private $shareManager; @@ -35,9 +35,7 @@ class SharingTest extends TestCase { protected function setUp(): void { parent::setUp(); - /** @var IConfig|MockObject */ $this->config = $this->getMockBuilder(IConfig::class)->getMock(); - /** @var IL10N|MockObject */ $this->l10n = $this->getMockBuilder(IL10N::class)->getMock(); /** @var IManager|MockObject */ @@ -82,7 +80,7 @@ class SharingTest extends TestCase { ['core', 'shareapi_expire_after_n_days', '7', '7'], ['core', 'shareapi_enforce_expire_date', 'no', 'no'], ['core', 'shareapi_exclude_groups', 'no', 'no'], - ['core', 'shareapi_public_link_disclaimertext', null, 'Lorem ipsum'], + ['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'], ['core', 'shareapi_enable_link_password_by_default', 'no', 'yes'], ['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL], ['core', 'shareapi_default_internal_expire_date', 'no', 'no'], @@ -98,50 +96,53 @@ class SharingTest extends TestCase { ->willReturn(false); $this->appManager->method('isEnabledForUser')->with('files_sharing')->willReturn(false); + + $initialStateCalls = []; $this->initialState ->expects($this->exactly(3)) ->method('provideInitialState') - ->withConsecutive( - ['sharingAppEnabled', false], - ['sharingDocumentation', ''], - [ - 'sharingSettings', - [ - 'allowGroupSharing' => true, - 'allowLinks' => true, - 'allowPublicUpload' => true, - 'allowResharing' => true, - 'allowShareDialogUserEnumeration' => true, - 'restrictUserEnumerationToGroup' => false, - 'restrictUserEnumerationToPhone' => false, - 'restrictUserEnumerationFullMatch' => true, - 'restrictUserEnumerationFullMatchUserId' => true, - 'restrictUserEnumerationFullMatchEmail' => true, - 'restrictUserEnumerationFullMatchIgnoreSecondDN' => false, - 'enforceLinksPassword' => false, - 'onlyShareWithGroupMembers' => false, - 'enabled' => true, - 'defaultExpireDate' => false, - 'expireAfterNDays' => '7', - 'enforceExpireDate' => false, - 'excludeGroups' => 'no', - 'excludeGroupsList' => [], - 'publicShareDisclaimerText' => 'Lorem ipsum', - 'enableLinkPasswordByDefault' => true, - 'defaultPermissions' => Constants::PERMISSION_ALL, - 'defaultInternalExpireDate' => false, - 'internalExpireAfterNDays' => '7', - 'enforceInternalExpireDate' => false, - 'defaultRemoteExpireDate' => false, - 'remoteExpireAfterNDays' => '7', - 'enforceRemoteExpireDate' => false, - 'allowLinksExcludeGroups' => [], - 'onlyShareWithGroupMembersExcludeGroupList' => [], - 'enforceLinksPasswordExcludedGroups' => [], - 'enforceLinksPasswordExcludedGroupsEnabled' => false, - ] - ], - ); + ->willReturnCallback(function (string $key) use (&$initialStateCalls) { + $initialStateCalls[$key] = func_get_args(); + }); + + $expectedInitialStateCalls = [ + 'sharingAppEnabled' => false, + 'sharingDocumentation' => '', + 'sharingSettings' => [ + 'allowGroupSharing' => true, + 'allowLinks' => true, + 'allowPublicUpload' => true, + 'allowResharing' => true, + 'allowShareDialogUserEnumeration' => true, + 'restrictUserEnumerationToGroup' => false, + 'restrictUserEnumerationToPhone' => false, + 'restrictUserEnumerationFullMatch' => true, + 'restrictUserEnumerationFullMatchUserId' => true, + 'restrictUserEnumerationFullMatchEmail' => true, + 'restrictUserEnumerationFullMatchIgnoreSecondDN' => false, + 'enforceLinksPassword' => false, + 'onlyShareWithGroupMembers' => false, + 'enabled' => true, + 'defaultExpireDate' => false, + 'expireAfterNDays' => '7', + 'enforceExpireDate' => false, + 'excludeGroups' => 'no', + 'excludeGroupsList' => [], + 'publicShareDisclaimerText' => 'Lorem ipsum', + 'enableLinkPasswordByDefault' => true, + 'defaultPermissions' => Constants::PERMISSION_ALL, + 'defaultInternalExpireDate' => false, + 'internalExpireAfterNDays' => '7', + 'enforceInternalExpireDate' => false, + 'defaultRemoteExpireDate' => false, + 'remoteExpireAfterNDays' => '7', + 'enforceRemoteExpireDate' => false, + 'allowLinksExcludeGroups' => [], + 'onlyShareWithGroupMembersExcludeGroupList' => [], + 'enforceLinksPasswordExcludedGroups' => [], + 'enforceLinksPasswordExcludedGroupsEnabled' => false, + ] + ]; $expected = new TemplateResponse( 'settings', @@ -151,6 +152,7 @@ class SharingTest extends TestCase { ); $this->assertEquals($expected, $this->admin->getForm()); + $this->assertEquals(sort($expectedInitialStateCalls), sort($initialStateCalls), 'Provided initial state does not match'); } public function testGetFormWithExcludedGroups(): void { @@ -175,7 +177,7 @@ class SharingTest extends TestCase { ['core', 'shareapi_expire_after_n_days', '7', '7'], ['core', 'shareapi_enforce_expire_date', 'no', 'no'], ['core', 'shareapi_exclude_groups', 'no', 'yes'], - ['core', 'shareapi_public_link_disclaimertext', null, 'Lorem ipsum'], + ['core', 'shareapi_public_link_disclaimertext', '', 'Lorem ipsum'], ['core', 'shareapi_enable_link_password_by_default', 'no', 'yes'], ['core', 'shareapi_default_permissions', (string)Constants::PERMISSION_ALL, Constants::PERMISSION_ALL], ['core', 'shareapi_default_internal_expire_date', 'no', 'no'], @@ -191,50 +193,53 @@ class SharingTest extends TestCase { ->willReturn(false); $this->appManager->method('isEnabledForUser')->with('files_sharing')->willReturn(true); + + $initialStateCalls = []; $this->initialState ->expects($this->exactly(3)) ->method('provideInitialState') - ->withConsecutive( - ['sharingAppEnabled', true], - ['sharingDocumentation', ''], - [ - 'sharingSettings', - [ - 'allowGroupSharing' => true, - 'allowLinks' => true, - 'allowPublicUpload' => true, - 'allowResharing' => true, - 'allowShareDialogUserEnumeration' => true, - 'restrictUserEnumerationToGroup' => false, - 'restrictUserEnumerationToPhone' => false, - 'restrictUserEnumerationFullMatch' => true, - 'restrictUserEnumerationFullMatchUserId' => true, - 'restrictUserEnumerationFullMatchEmail' => true, - 'restrictUserEnumerationFullMatchIgnoreSecondDN' => false, - 'enforceLinksPassword' => false, - 'onlyShareWithGroupMembers' => false, - 'enabled' => true, - 'defaultExpireDate' => false, - 'expireAfterNDays' => '7', - 'enforceExpireDate' => false, - 'excludeGroups' => 'yes', - 'excludeGroupsList' => ['NoSharers','OtherNoSharers'], - 'publicShareDisclaimerText' => 'Lorem ipsum', - 'enableLinkPasswordByDefault' => true, - 'defaultPermissions' => Constants::PERMISSION_ALL, - 'defaultInternalExpireDate' => false, - 'internalExpireAfterNDays' => '7', - 'enforceInternalExpireDate' => false, - 'defaultRemoteExpireDate' => false, - 'remoteExpireAfterNDays' => '7', - 'enforceRemoteExpireDate' => false, - 'allowLinksExcludeGroups' => [], - 'onlyShareWithGroupMembersExcludeGroupList' => [], - 'enforceLinksPasswordExcludedGroups' => [], - 'enforceLinksPasswordExcludedGroupsEnabled' => false, - ] - ], - ); + ->willReturnCallback(function (string $key) use (&$initialStateCalls) { + $initialStateCalls[$key] = func_get_args(); + }); + + $expectedInitialStateCalls = [ + 'sharingAppEnabled' => true, + 'sharingDocumentation' => '', + 'sharingSettings' => [ + 'allowGroupSharing' => true, + 'allowLinks' => true, + 'allowPublicUpload' => true, + 'allowResharing' => true, + 'allowShareDialogUserEnumeration' => true, + 'restrictUserEnumerationToGroup' => false, + 'restrictUserEnumerationToPhone' => false, + 'restrictUserEnumerationFullMatch' => true, + 'restrictUserEnumerationFullMatchUserId' => true, + 'restrictUserEnumerationFullMatchEmail' => true, + 'restrictUserEnumerationFullMatchIgnoreSecondDN' => false, + 'enforceLinksPassword' => false, + 'onlyShareWithGroupMembers' => false, + 'enabled' => true, + 'defaultExpireDate' => false, + 'expireAfterNDays' => '7', + 'enforceExpireDate' => false, + 'excludeGroups' => 'yes', + 'excludeGroupsList' => ['NoSharers','OtherNoSharers'], + 'publicShareDisclaimerText' => 'Lorem ipsum', + 'enableLinkPasswordByDefault' => true, + 'defaultPermissions' => Constants::PERMISSION_ALL, + 'defaultInternalExpireDate' => false, + 'internalExpireAfterNDays' => '7', + 'enforceInternalExpireDate' => false, + 'defaultRemoteExpireDate' => false, + 'remoteExpireAfterNDays' => '7', + 'enforceRemoteExpireDate' => false, + 'allowLinksExcludeGroups' => [], + 'onlyShareWithGroupMembersExcludeGroupList' => [], + 'enforceLinksPasswordExcludedGroups' => [], + 'enforceLinksPasswordExcludedGroupsEnabled' => false, + ], + ]; $expected = new TemplateResponse( 'settings', @@ -244,6 +249,7 @@ class SharingTest extends TestCase { ); $this->assertEquals($expected, $this->admin->getForm()); + $this->assertEquals(sort($expectedInitialStateCalls), sort($initialStateCalls), 'Provided initial state does not match'); } public function testGetSection(): void { |