Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make AppsEnableTest and AppsDisableTest independet of the app version… #29027

Merged
merged 1 commit into from
Oct 4, 2021
+22 −22
Merged

Make AppsEnableTest and AppsDisableTest independet of the app version… #29027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tests/Core/Command/Apps/AppsDisableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,31 @@ protected function setUp(): void {
* @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 changes: 13 additions & 13 deletions tests/Core/Command/Apps/AppsEnableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ protected function setUp(): void {
* @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)) {
Expand All @@ -67,29 +67,29 @@ public function testCommandInput($appId, $groups, $statusCode, $output): void {

$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"],
];
}
}