Skip to content

Fix casing of core test folder, bring back missing tests #26265

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

Merged
nickvergessen merged 6 commits into from
Mar 24, 2021
Merged

Fix casing of core test folder, bring back missing tests #26265

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e210e8e
Fix casing of core test folder
PVince81 Mar 23, 2021
c467f64
Fix core tests command for app enabling/disabling
PVince81 Mar 23, 2021
9b8ca16
Fix more tests in the Core subdir
PVince81 Mar 24, 2021
95e03fb
Fix more controller tests in Core subdir
PVince81 Mar 24, 2021
8b92776
Bring back forgotten tests
PVince81 Mar 24, 2021
39a6d99
Fix language codes test result order
PVince81 Mar 24, 2021
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
12 changes: 6 additions & 6 deletions tests/Core/Command/Apps/AppsDisableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@ public function testCommandInput($appId, $statusCode, $output): void {

public function dataCommandInput(): array {
return [
[['admin_audit'], 0, 'admin_audit 1.10.0 disabled'],
[['comments'], 0, 'comments 1.10.0 disabled'],
[['admin_audit'], 0, 'admin_audit 1.11.0 disabled'],
[['comments'], 0, 'comments 1.11.0 disabled'],
[['invalid_app'], 0, 'No such app enabled: invalid_app'],

[['admin_audit', 'comments'], 0, "admin_audit 1.10.0 disabled\ncomments 1.10.0 disabled"],
[['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit 1.10.0 disabled\ncomments 1.10.0 disabled\nNo such app enabled: invalid_app"],
[['admin_audit', 'comments'], 0, "admin_audit 1.11.0 disabled\ncomments 1.11.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"],

[['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.10.0 disabled"],
[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments 1.10.0 disabled"],
[['files', 'admin_audit'], 2, "files can't be disabled.\nadmin_audit 1.11.0 disabled"],
[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments 1.11.0 disabled"],

];
}
Expand Down
22 changes: 11 additions & 11 deletions tests/Core/Command/Apps/AppsEnableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,28 +73,28 @@ public function testCommandInput($appId, $groups, $statusCode, $output): void {

public function dataCommandInput(): array {
$data = [
[['admin_audit'], null, 0, 'admin_audit 1.10.0 enabled'],
[['comments'], null, 0, 'comments 1.10.0 enabled'],
[['comments', 'comments'], null, 0, "comments 1.10.0 enabled\ncomments already enabled"],
[['admin_audit'], null, 0, 'admin_audit 1.11.0 enabled'],
[['comments'], null, 0, 'comments 1.11.0 enabled'],
[['comments', 'comments'], null, 0, "comments 1.11.0 enabled\ncomments already enabled"],
[['invalid_app'], null, 1, 'Could not download app invalid_app'],

[['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.10.0 enabled\ncomments 1.10.0 enabled\nCould not download app invalid_app"],
[['admin_audit', 'comments'], null, 0, "admin_audit 1.11.0 enabled\ncomments 1.11.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'], ['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.10.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'], 0, 'updatenotification 1.11.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'], ['admin', 'invalid_group'], 0, 'updatenotification 1.10.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.10.0 enabled for groups: admin\naccessibility 1.6.0 enabled for groups: admin\nCould not download app invalid_app"],
[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification 1.11.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', '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"],
];

if (getenv('CI') === false) {
/** Tests disabled on drone/ci due to appstore dependency */
$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'], 0, "updatenotification 1.11.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', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification enabled for groups: admin\ncontacts enabled for groups: admin\nCould not download app invalid_app"];
}
Expand Down
3 changes: 1 addition & 2 deletions tests/phpunit-autotest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
>
<testsuite name='ownCloud'>
<directory suffix='.php'>lib/</directory>
<directory suffix='.php'>core/</directory>
<directory suffix='.php'>Core/</directory>
<directory suffix='.php'>ocs-provider/</directory>
<file>apps.php</file>
</testsuite>
Expand All @@ -32,4 +32,3 @@
<listener class="StartSessionListener" file="startsessionlistener.php" />
</listeners>
</phpunit>