upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #29027 from nextcloud/debt/noid/make-tests-independend-of-version-numbers

Browse source 
Make AppsEnableTest and AppsDisableTest independet of the app version…
This commit is contained in:
Lukas Reschke 2021-10-04 19:53:06 +02:00 committed by GitHub
commit 9178484699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/Core/Command/Apps/AppsDisableTest.php
View file

@ -55,31 +55,31 @@ class AppsDisableTest extends TestCase {
* @param $appId
* @param $groups
* @param $statusCode
* @param $output
* @param $pattern
*/
public function testCommandInput($appId, $statusCode, $output): void {
public function testCommandInput($appId, $statusCode, $pattern): void {
$input = ['app-id' => $appId];
$this->commandTester->execute($input);
$this->assertStringContainsString($output, $this->commandTester->getDisplay());
$this->assertRegExp('/' . $pattern . '/', $this->commandTester->getDisplay());
$this->assertSame($statusCode, $this->commandTester->getStatusCode());
}
public function dataCommandInput(): array {
return [
[['admin_audit'], 0, 'admin_audit 1.13.0 disabled'],
[['comments'], 0, 'comments 1.13.0 disabled'],
[['admin_audit'], 0, 'admin_audit ([\d\.]*) disabled'],
[['comments'], 0, 'comments ([\d\.]*) disabled'],
[['invalid_app'], 0, 'No such app enabled: invalid_app'],
[['admin_audit', 'comments'], 0, "admin_audit 1.13.0 disabled\ncomments 1.13.0 disabled"],
[['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit 1.13.0 disabled\ncomments 1.13.0 disabled\nNo such app enabled: invalid_app"],
[['admin_audit', 'comments'], 0, "admin_audit ([\d\.]*) disabled\ncomments ([\d\.]*) disabled"],
[['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit ([\d\.]*) disabled\ncomments ([\d\.]*) disabled\nNo such app enabled: invalid_app"],
[['files'], 2, "files 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.13.0 disabled"],
[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments 1.13.0 disabled"],
[['files', 'admin_audit'], 2, "files can't be disabled.\nadmin_audit ([\d\.]*) disabled"],
[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments ([\d\.]*) disabled"],
];
}
}

26
tests/Core/Command/Apps/AppsEnableTest.php
View file

@ -56,9 +56,9 @@ class AppsEnableTest extends TestCase {
* @param $appId
* @param $groups
* @param $statusCode
* @param $output
* @param $pattern
*/
public function testCommandInput($appId, $groups, $statusCode, $output): void {
public function testCommandInput($appId, $groups, $statusCode, $pattern): void {
$input = ['app-id' => $appId];
if (is_array($groups)) {
@ -67,29 +67,29 @@ class AppsEnableTest extends TestCase {
$this->commandTester->execute($input);
$this->assertStringContainsString($output, $this->commandTester->getDisplay());
$this->assertRegExp('/' . $pattern . '/', $this->commandTester->getDisplay());
$this->assertSame($statusCode, $this->commandTester->getStatusCode());
}
public function dataCommandInput(): array {
return [
[['admin_audit'], null, 0, 'admin_audit 1.13.0 enabled'],
[['comments'], null, 0, 'comments 1.13.0 enabled'],
[['comments', 'comments'], null, 0, "comments 1.13.0 enabled\ncomments already enabled"],
[['admin_audit'], null, 0, 'admin_audit ([\d\.]*) enabled'],
[['comments'], null, 0, 'comments ([\d\.]*) enabled'],
[['comments', 'comments'], null, 0, "comments ([\d\.]*) enabled\ncomments already enabled"],
[['invalid_app'], null, 1, 'Could not download app invalid_app'],
[['admin_audit', 'comments'], null, 0, "admin_audit 1.13.0 enabled\ncomments 1.13.0 enabled"],
[['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit 1.13.0 enabled\ncomments 1.13.0 enabled\nCould not download app invalid_app"],
[['admin_audit', 'comments'], null, 0, "admin_audit ([\d\.]*) enabled\ncomments ([\d\.]*) enabled"],
[['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit ([\d\.]*) enabled\ncomments ([\d\.]*) enabled\nCould not download app invalid_app"],
[['admin_audit'], ['admin'], 1, "admin_audit can't be enabled for groups"],
[['comments'], ['admin'], 1, "comments can't be enabled for groups"],
[['updatenotification'], ['admin'], 0, 'updatenotification 1.13.0 enabled for groups: admin'],
[['updatenotification', 'accessibility'], ['admin'], 0, "updatenotification 1.13.0 enabled for groups: admin\naccessibility 1.9.0 enabled for groups: admin"],
[['updatenotification'], ['admin'], 0, 'updatenotification ([\d\.]*) enabled for groups: admin'],
[['updatenotification', 'accessibility'], ['admin'], 0, "updatenotification ([\d\.]*) enabled for groups: admin\naccessibility ([\d\.]*) enabled for groups: admin"],
[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification 1.13.0 enabled for groups: admin'],
[['updatenotification', 'accessibility'], ['admin', 'invalid_group'], 0, "updatenotification 1.13.0 enabled for groups: admin\naccessibility 1.9.0 enabled for groups: admin"],
[['updatenotification', 'accessibility', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification 1.13.0 enabled for groups: admin\naccessibility 1.9.0 enabled for groups: admin\nCould not download app invalid_app"],
[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification ([\d\.]*) enabled for groups: admin'],
[['updatenotification', 'accessibility'], ['admin', 'invalid_group'], 0, "updatenotification ([\d\.]*) enabled for groups: admin\naccessibility ([\d\.]*) enabled for groups: admin"],
[['updatenotification', 'accessibility', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification ([\d\.]*) enabled for groups: admin\naccessibility ([\d\.]*) enabled for groups: admin\nCould not download app invalid_app"],
];
}
}