upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-19 17:13:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 60

Merge pull request #34646 from nextcloud/backport/34609/stable25

Browse source 
[stable25] set theming app to alwaysEnabled
This commit is contained in:
blizzz 2022-10-19 11:17:32 +02:00 committed by GitHub
commit c7a9514aa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/shipped.json
View file

@ -97,6 +97,7 @@
"provisioning_api",
"oauth2",
"settings",
"theming",
"twofactor_backupcodes",
"viewer",
"workflowengine"

5
tests/lib/App/AppManagerTest.php
View file

@ -429,6 +429,7 @@ class AppManagerTest extends TestCase {
'settings',
'test1',
'test3',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
@ -458,6 +459,7 @@ class AppManagerTest extends TestCase {
'settings',
'test1',
'test3',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
@ -485,6 +487,7 @@ class AppManagerTest extends TestCase {
'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'],
@ -534,6 +537,7 @@ class AppManagerTest extends TestCase {
'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'],
@ -580,6 +584,7 @@ class AppManagerTest extends TestCase {
'settings',
'test1',
'test3',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',

9
tests/lib/AppTest.php
View file

@ -346,6 +346,7 @@ class AppTest extends \Test\TestCase {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
@ -368,6 +369,7 @@ class AppTest extends \Test\TestCase {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
@ -391,6 +393,7 @@ class AppTest extends \Test\TestCase {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
@ -414,6 +417,7 @@ class AppTest extends \Test\TestCase {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
@ -437,6 +441,7 @@ class AppTest extends \Test\TestCase {
'oauth2',
'provisioning_api',
'settings',
'theming',
'twofactor_backupcodes',
'viewer',
'workflowengine',
@ -517,11 +522,11 @@ class AppTest extends \Test\TestCase {
);
$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);