Reset app configs by deleting the values instead of setting the defaults
This avoids the need to keep the default values in the integration tests in sync with the code, and also makes possible to reset values with "dynamic" defaults (defaults that depend on other values). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
parent
a50132e4e1
commit
8832d15069
|
@ -72,6 +72,19 @@ trait AppConfiguration {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $app
|
||||
* @param string $parameter
|
||||
* @param string $value
|
||||
*/
|
||||
protected function deleteServerConfig($app, $parameter) {
|
||||
$this->sendingTo('DELETE', "/apps/testing/api/v1/app/{$app}/{$parameter}");
|
||||
$this->theHTTPStatusCodeShouldBe('200');
|
||||
if ($this->apiVersion === 1) {
|
||||
$this->theOCSStatusCodeShouldBe('100');
|
||||
}
|
||||
}
|
||||
|
||||
protected function setStatusTestingApp($enabled) {
|
||||
$this->sendingTo(($enabled ? 'post' : 'delete'), '/cloud/apps/testing');
|
||||
$this->theHTTPStatusCodeShouldBe('200');
|
||||
|
|
|
@ -61,16 +61,16 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
|
|||
}
|
||||
|
||||
protected function resetAppConfigs() {
|
||||
$this->modifyServerConfig('core', 'shareapi_enabled', 'yes');
|
||||
$this->modifyServerConfig('core', 'shareapi_allow_links', 'yes');
|
||||
$this->modifyServerConfig('core', 'shareapi_allow_public_upload', 'yes');
|
||||
$this->modifyServerConfig('core', 'shareapi_allow_resharing', 'yes');
|
||||
$this->modifyServerConfig('files_sharing', 'outgoing_server2server_share_enabled', 'yes');
|
||||
$this->modifyServerConfig('files_sharing', 'incoming_server2server_share_enabled', 'yes');
|
||||
$this->modifyServerConfig('core', 'shareapi_enforce_links_password', 'no');
|
||||
$this->modifyServerConfig('core', 'shareapi_allow_public_notification', 'no');
|
||||
$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
|
||||
$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
|
||||
$this->modifyServerConfig('core', 'shareapi_allow_group_sharing', 'yes');
|
||||
$this->deleteServerConfig('core', 'shareapi_enabled');
|
||||
$this->deleteServerConfig('core', 'shareapi_allow_links');
|
||||
$this->deleteServerConfig('core', 'shareapi_allow_public_upload');
|
||||
$this->deleteServerConfig('core', 'shareapi_allow_resharing');
|
||||
$this->deleteServerConfig('files_sharing', 'outgoing_server2server_share_enabled');
|
||||
$this->deleteServerConfig('files_sharing', 'incoming_server2server_share_enabled');
|
||||
$this->deleteServerConfig('core', 'shareapi_enforce_links_password');
|
||||
$this->deleteServerConfig('core', 'shareapi_allow_public_notification');
|
||||
$this->deleteServerConfig('core', 'shareapi_default_expire_date');
|
||||
$this->deleteServerConfig('core', 'shareapi_enforce_expire_date');
|
||||
$this->deleteServerConfig('core', 'shareapi_allow_group_sharing');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -97,7 +97,7 @@ class FederationContext implements Context, SnippetAcceptingContext {
|
|||
}
|
||||
|
||||
protected function resetAppConfigs() {
|
||||
$this->modifyServerConfig('files_sharing', 'incoming_server2server_group_share_enabled', 'no');
|
||||
$this->modifyServerConfig('files_sharing', 'outgoing_server2server_group_share_enabled', 'no');
|
||||
$this->deleteServerConfig('files_sharing', 'incoming_server2server_group_share_enabled');
|
||||
$this->deleteServerConfig('files_sharing', 'outgoing_server2server_group_share_enabled');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,8 +36,8 @@ class ShareesContext implements Context, SnippetAcceptingContext {
|
|||
use AppConfiguration;
|
||||
|
||||
protected function resetAppConfigs() {
|
||||
$this->modifyServerConfig('core', 'shareapi_only_share_with_group_members', 'no');
|
||||
$this->modifyServerConfig('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes');
|
||||
$this->modifyServerConfig('core', 'shareapi_allow_group_sharing', 'yes');
|
||||
$this->deleteServerConfig('core', 'shareapi_only_share_with_group_members');
|
||||
$this->deleteServerConfig('core', 'shareapi_allow_share_dialog_user_enumeration');
|
||||
$this->deleteServerConfig('core', 'shareapi_allow_group_sharing');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ class SharingContext implements Context, SnippetAcceptingContext {
|
|||
use CommandLine;
|
||||
|
||||
protected function resetAppConfigs() {
|
||||
$this->modifyServerConfig('core', 'shareapi_default_permissions', '31');
|
||||
$this->modifyServerConfig('sharebymail', 'enforcePasswordProtection', 'no');
|
||||
$this->deleteServerConfig('core', 'shareapi_default_permissions');
|
||||
$this->deleteServerConfig('sharebymail', 'enforcePasswordProtection');
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue