Revert "Fix core tests command for app enabling/disabling"

This reverts commit acfffcc685.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
This commit is contained in:
Vincent Petry 2021-03-24 17:17:16 +01:00
parent 945eb07497
commit d86c4f9662
No known key found for this signature in database
GPG Key ID: E055D6A4D513575C
2 changed files with 17 additions and 17 deletions

View File

@ -68,18 +68,18 @@ class AppsDisableTest extends TestCase {
public function dataCommandInput(): array { public function dataCommandInput(): array {
return [ return [
[['admin_audit'], 0, 'admin_audit 1.11.0 disabled'], [['admin_audit'], 0, 'admin_audit 1.10.0 disabled'],
[['comments'], 0, 'comments 1.11.0 disabled'], [['comments'], 0, 'comments 1.10.0 disabled'],
[['invalid_app'], 0, 'No such app enabled: invalid_app'], [['invalid_app'], 0, 'No such app enabled: invalid_app'],
[['admin_audit', 'comments'], 0, "admin_audit 1.11.0 disabled\ncomments 1.11.0 disabled"], [['admin_audit', 'comments'], 0, "admin_audit 1.10.0 disabled\ncomments 1.10.0 disabled"],
[['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit 1.11.0 disabled\ncomments 1.11.0 disabled\nNo such app enabled: invalid_app"], [['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit 1.10.0 disabled\ncomments 1.10.0 disabled\nNo such app enabled: invalid_app"],
[['files'], 2, "files can't be disabled"], [['files'], 2, "files can't be disabled"],
[['provisioning_api'], 2, "provisioning_api can't be disabled"], [['provisioning_api'], 2, "provisioning_api can't be disabled"],
[['files', 'admin_audit'], 2, "files can't be disabled.\nadmin_audit 1.11.0 disabled"], [['files', 'admin_audit'], 2, "files can't be disabled.\nadmin_audit 1.10.0 disabled"],
[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments 1.11.0 disabled"], [['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments 1.10.0 disabled"],
]; ];
} }

View File

@ -73,28 +73,28 @@ class AppsEnableTest extends TestCase {
public function dataCommandInput(): array { public function dataCommandInput(): array {
$data = [ $data = [
[['admin_audit'], null, 0, 'admin_audit 1.11.0 enabled'], [['admin_audit'], null, 0, 'admin_audit 1.10.0 enabled'],
[['comments'], null, 0, 'comments 1.11.0 enabled'], [['comments'], null, 0, 'comments 1.10.0 enabled'],
[['comments', 'comments'], null, 0, "comments 1.11.0 enabled\ncomments already enabled"], [['comments', 'comments'], null, 0, "comments 1.10.0 enabled\ncomments already enabled"],
[['invalid_app'], null, 1, 'Could not download app invalid_app'], [['invalid_app'], null, 1, 'Could not download app invalid_app'],
[['admin_audit', 'comments'], null, 0, "admin_audit 1.11.0 enabled\ncomments 1.11.0 enabled"], [['admin_audit', 'comments'], null, 0, "admin_audit 1.10.0 enabled\ncomments 1.10.0 enabled"],
[['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit 1.11.0 enabled\ncomments 1.11.0 enabled\nCould not download app invalid_app"], [['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit 1.10.0 enabled\ncomments 1.10.0 enabled\nCould not download app invalid_app"],
[['admin_audit'], ['admin'], 1, "admin_audit can't be enabled for groups"], [['admin_audit'], ['admin'], 1, "admin_audit can't be enabled for groups"],
[['comments'], ['admin'], 1, "comments can't be enabled for groups"], [['comments'], ['admin'], 1, "comments can't be enabled for groups"],
[['updatenotification'], ['admin'], 0, 'updatenotification 1.11.0 enabled for groups: admin'], [['updatenotification'], ['admin'], 0, 'updatenotification 1.10.0 enabled for groups: admin'],
[['updatenotification', 'accessibility'], ['admin'], 0, "updatenotification 1.11.0 enabled for groups: admin\naccessibility 1.7.0 enabled for groups: admin"], [['updatenotification', 'accessibility'], ['admin'], 0, "updatenotification 1.10.0 enabled for groups: admin\naccessibility 1.6.0 enabled for groups: admin"],
[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification 1.11.0 enabled for groups: admin'], [['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification 1.10.0 enabled for groups: admin'],
[['updatenotification', 'accessibility'], ['admin', 'invalid_group'], 0, "updatenotification 1.11.0 enabled for groups: admin\naccessibility 1.7.0 enabled for groups: admin"], [['updatenotification', 'accessibility'], ['admin', 'invalid_group'], 0, "updatenotification 1.10.0 enabled for groups: admin\naccessibility 1.6.0 enabled for groups: admin"],
[['updatenotification', 'accessibility', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification 1.11.0 enabled for groups: admin\naccessibility 1.7.0 enabled for groups: admin\nCould not download app invalid_app"], [['updatenotification', 'accessibility', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification 1.10.0 enabled for groups: admin\naccessibility 1.6.0 enabled for groups: admin\nCould not download app invalid_app"],
]; ];
if (getenv('CI') === false) { if (getenv('CI') === false) {
/** Tests disabled on drone/ci due to appstore dependency */ /** Tests disabled on drone/ci due to appstore dependency */
$data[] = [['updatenotification', 'contacts'], ['admin'], 0, "updatenotification 1.11.0 enabled for groups: admin\ncontacts 3.3.0 enabled for groups: admin"]; $data[] = [['updatenotification', 'contacts'], ['admin'], 0, "updatenotification 1.10.0 enabled for groups: admin\ncontacts 3.3.0 enabled for groups: admin"];
$data[] = [['updatenotification', 'contacts'], ['admin', 'invalid_group'], 0, "updatenotification enabled for groups: admin\ncontacts 3.3.0 enabled for groups: admin"]; $data[] = [['updatenotification', 'contacts'], ['admin', 'invalid_group'], 0, "updatenotification enabled for groups: admin\ncontacts 3.3.0 enabled for groups: admin"];
$data[] = [['updatenotification', 'contacts', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification enabled for groups: admin\ncontacts enabled for groups: admin\nCould not download app invalid_app"]; $data[] = [['updatenotification', 'contacts', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification enabled for groups: admin\ncontacts enabled for groups: admin\nCould not download app invalid_app"];
} }