mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tests due to config adjustments 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2020-03-10 16:19:49 +01:00
parent ae4dc3467c
commit 47271e56ee
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
View File

@ -431,10 +431,9 @@ class PrincipalTest extends TestCase {
->will($this->returnValue($sharingEnabled));
if ($sharingEnabled) {
$this->config->expects($this->once())
->method('getAppValue')
->with('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes')
->willReturn('yes');
$this->shareManager->expects($this->once())
->method('allowEnumeration')
->willReturn(true);
$this->shareManager->expects($this->once())
->method('shareWithGroupMembersOnly')
@ -526,10 +525,9 @@ class PrincipalTest extends TestCase {
->method('shareAPIEnabled')
->will($this->returnValue(true));
$this->config->expects($this->exactly(2))
->method('getAppValue')
->with('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes')
->willReturn('yes');
$this->shareManager->expects($this->exactly(2))
->method('allowEnumeration')
->willReturn(true);
$this->shareManager->expects($this->exactly(2))
->method('shareWithGroupMembersOnly')
@ -557,10 +555,9 @@ class PrincipalTest extends TestCase {
->method('shareAPIEnabled')
->will($this->returnValue(true));
$this->config->expects($this->once())
->method('getAppValue')
->with('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes')
->willReturn('no');
$this->shareManager->expects($this->once())
->method('allowEnumeration')
->willReturn(false);
$this->shareManager->expects($this->once())
->method('shareWithGroupMembersOnly')
@ -593,10 +590,9 @@ class PrincipalTest extends TestCase {
->method('shareAPIEnabled')
->will($this->returnValue(true));
$this->config->expects($this->once())
->method('getAppValue')
->with('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes')
->willReturn('no');
$this->shareManager->expects($this->once())
->method('allowEnumeration')
->willReturn(false);
$this->shareManager->expects($this->once())
->method('shareWithGroupMembersOnly')

52
apps/settings/tests/Settings/Admin/SharingTest.php
View File

@ -94,55 +94,60 @@ class SharingTest extends TestCase {
$this->config
->expects($this->at(6))
->method('getAppValue')
->with('core', 'shareapi_restrict_user_enumeration_to_group', 'no')
->willReturn('no');
$this->config
->expects($this->at(7))
->method('getAppValue')
->with('core', 'shareapi_enabled', 'yes')
->willReturn('yes');
$this->config
->expects($this->at(7))
->expects($this->at(8))
->method('getAppValue')
->with('core', 'shareapi_default_expire_date', 'no')
->willReturn('no');
$this->config
->expects($this->at(8))
->expects($this->at(9))
->method('getAppValue')
->with('core', 'shareapi_expire_after_n_days', '7')
->willReturn('7');
$this->config
->expects($this->at(9))
->expects($this->at(10))
->method('getAppValue')
->with('core', 'shareapi_enforce_expire_date', 'no')
->willReturn('no');
$this->config
->expects($this->at(10))
->expects($this->at(11))
->method('getAppValue')
->with('core', 'shareapi_exclude_groups', 'no')
->willReturn('no');
$this->config
->expects($this->at(11))
->expects($this->at(12))
->method('getAppValue')
->with('core', 'shareapi_public_link_disclaimertext', null)
->willReturn('Lorem ipsum');
$this->config
->expects($this->at(12))
->expects($this->at(13))
->method('getAppValue')
->with('core', 'shareapi_enable_link_password_by_default', 'no')
->willReturn('yes');
$this->config
->expects($this->at(13))
->expects($this->at(14))
->method('getAppValue')
->with('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL)
->willReturn(Constants::PERMISSION_ALL);
$this->config
->expects($this->at(14))
->expects($this->at(15))
->method('getAppValue')
->with('core', 'shareapi_default_internal_expire_date', 'no')
->willReturn('no');
$this->config
->expects($this->at(15))
->expects($this->at(16))
->method('getAppValue')
->with('core', 'shareapi_internal_expire_after_n_days', '7')
->willReturn('7');
$this->config
->expects($this->at(16))
->expects($this->at(17))
->method('getAppValue')
->with('core', 'shareapi_enforce_internal_expire_date', 'no')
->willReturn('no');
@ -156,6 +161,7 @@ class SharingTest extends TestCase {
'allowPublicUpload' => 'yes',
'allowResharing' => 'yes',
'allowShareDialogUserEnumeration' => 'yes',
'restrictUserEnumerationToGroup' => 'no',
'enforceLinkPassword' => false,
'onlyShareWithGroupMembers' => false,
'shareAPIEnabled' => 'yes',
@ -212,55 +218,60 @@ class SharingTest extends TestCase {
$this->config
->expects($this->at(6))
->method('getAppValue')
->with('core', 'shareapi_restrict_user_enumeration_to_group', 'no')
->willReturn('no');
$this->config
->expects($this->at(7))
->method('getAppValue')
->with('core', 'shareapi_enabled', 'yes')
->willReturn('yes');
$this->config
->expects($this->at(7))
->expects($this->at(8))
->method('getAppValue')
->with('core', 'shareapi_default_expire_date', 'no')
->willReturn('no');
$this->config
->expects($this->at(8))
->expects($this->at(9))
->method('getAppValue')
->with('core', 'shareapi_expire_after_n_days', '7')
->willReturn('7');
$this->config
->expects($this->at(9))
->expects($this->at(10))
->method('getAppValue')
->with('core', 'shareapi_enforce_expire_date', 'no')
->willReturn('no');
$this->config
->expects($this->at(10))
->expects($this->at(11))
->method('getAppValue')
->with('core', 'shareapi_exclude_groups', 'no')
->willReturn('yes');
$this->config
->expects($this->at(11))
->expects($this->at(12))
->method('getAppValue')
->with('core', 'shareapi_public_link_disclaimertext', null)
->willReturn('Lorem ipsum');
$this->config
->expects($this->at(12))
->expects($this->at(13))
->method('getAppValue')
->with('core', 'shareapi_enable_link_password_by_default', 'no')
->willReturn('yes');
$this->config
->expects($this->at(13))
->expects($this->at(14))
->method('getAppValue')
->with('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL)
->willReturn(Constants::PERMISSION_ALL);
$this->config
->expects($this->at(14))
->expects($this->at(15))
->method('getAppValue')
->with('core', 'shareapi_default_internal_expire_date', 'no')
->willReturn('no');
$this->config
->expects($this->at(15))
->expects($this->at(16))
->method('getAppValue')
->with('core', 'shareapi_internal_expire_after_n_days', '7')
->willReturn('7');
$this->config
->expects($this->at(16))
->expects($this->at(17))
->method('getAppValue')
->with('core', 'shareapi_enforce_internal_expire_date', 'no')
->willReturn('no');
@ -275,6 +286,7 @@ class SharingTest extends TestCase {
'allowPublicUpload' => 'yes',
'allowResharing' => 'yes',
'allowShareDialogUserEnumeration' => 'yes',
'restrictUserEnumerationToGroup' => 'no',
'enforceLinkPassword' => false,
'onlyShareWithGroupMembers' => false,
'shareAPIEnabled' => 'yes',