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

[stable25] set theming app to alwaysEnabled #34646

Merged
merged 1 commit into from
Oct 19, 2022
Merged

[stable25] set theming app to alwaysEnabled #34646

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
1 change: 1 addition & 0 deletions core/shipped.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
"provisioning_api",
"oauth2",
"settings",
"theming",
"twofactor_backupcodes",
"viewer",
"workflowengine"
Expand Down
5 changes: 5 additions & 0 deletions tests/lib/App/AppManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ public function testGetInstalledApps() {
'settings',
'test1',
'test3',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand Down Expand Up @@ -458,6 +459,7 @@ public function testGetAppsForUser() {
'settings',
'test1',
'test3',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand Down Expand Up @@ -485,6 +487,7 @@ public function testGetAppsNeedingUpgrade() {
'test4' => ['id' => 'test4', 'version' => '3.0.0', 'requiremin' => '8.1.0'],
'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
'settings' => ['id' => 'settings'],
'theming' => ['id' => 'theming'],
'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
'viewer' => ['id' => 'viewer'],
'workflowengine' => ['id' => 'workflowengine'],
Expand Down Expand Up @@ -534,6 +537,7 @@ public function testGetIncompatibleApps() {
'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
'settings' => ['id' => 'settings'],
'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
'theming' => ['id' => 'theming'],
'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
'workflowengine' => ['id' => 'workflowengine'],
'oauth2' => ['id' => 'oauth2'],
Expand Down Expand Up @@ -580,6 +584,7 @@ public function testGetEnabledAppsForGroup() {
'settings',
'test1',
'test3',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand Down
9 changes: 7 additions & 2 deletions tests/lib/AppTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ public function appConfigValuesProvider() {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand All @@ -368,6 +369,7 @@ public function appConfigValuesProvider() {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand All @@ -391,6 +393,7 @@ public function appConfigValuesProvider() {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand All @@ -414,6 +417,7 @@ public function appConfigValuesProvider() {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand All @@ -437,6 +441,7 @@ public function appConfigValuesProvider() {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
Expand Down Expand Up @@ -517,11 +522,11 @@ public function testEnabledAppsCache() {
);

$apps = \OC_App::getEnabledApps();
$this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);
$this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);

// mock should not be called again here
$apps = \OC_App::getEnabledApps();
$this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);
$this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps);

$this->restoreAppConfig();
\OC_User::setUserId(null);
Expand Down