mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always enable cloud federation api 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2018-06-29 10:46:09 +02:00
parent cdf8abb060
commit 511a34b08f
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/shipped.json
View File

@ -3,6 +3,7 @@
"accessibility",
"activity",
"admin_audit",
"cloud_federation_api",
"comments",
"dav",
"encryption",
@ -38,6 +39,7 @@
],
"alwaysEnabled": [
"files",
"cloud_federation_api",
"dav",
"federatedfilesharing",
"lookup_server_connector",

4
tests/lib/App/AppManagerTest.php
View File

@ -330,6 +330,7 @@ class AppManagerTest extends TestCase {
$this->appConfig->setValue('test2', 'enabled', 'no');
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
$apps = [
'cloud_federation_api',
'dav',
'federatedfilesharing',
'files',
@ -356,6 +357,7 @@ class AppManagerTest extends TestCase {
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
$this->appConfig->setValue('test4', 'enabled', '["asd"]');
$enabled = [
'cloud_federation_api',
'dav',
'federatedfilesharing',
'files',
@ -378,6 +380,7 @@ class AppManagerTest extends TestCase {
->getMock();
$appInfos = [
'cloud_federation_api' => ['id' => 'cloud_federation_api'],
'dav' => ['id' => 'dav'],
'files' => ['id' => 'files'],
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
@ -425,6 +428,7 @@ class AppManagerTest extends TestCase {
->getMock();
$appInfos = [
'cloud_federation_api' => ['id' => 'cloud_federation_api'],
'dav' => ['id' => 'dav'],
'files' => ['id' => 'files'],
'federatedfilesharing' => ['id' => 'federatedfilesharing'],

9
tests/lib/AppTest.php
View File

@ -338,6 +338,7 @@ class AppTest extends \Test\TestCase {
'app3',
'appforgroup1',
'appforgroup12',
'cloud_federation_api',
'dav',
'federatedfilesharing',
'lookup_server_connector',
@ -357,6 +358,7 @@ class AppTest extends \Test\TestCase {
'app3',
'appforgroup12',
'appforgroup2',
'cloud_federation_api',
'dav',
'federatedfilesharing',
'lookup_server_connector',
@ -377,6 +379,7 @@ class AppTest extends \Test\TestCase {
'appforgroup1',
'appforgroup12',
'appforgroup2',
'cloud_federation_api',
'dav',
'federatedfilesharing',
'lookup_server_connector',
@ -397,6 +400,7 @@ class AppTest extends \Test\TestCase {
'appforgroup1',
'appforgroup12',
'appforgroup2',
'cloud_federation_api',
'dav',
'federatedfilesharing',
'lookup_server_connector',
@ -417,6 +421,7 @@ class AppTest extends \Test\TestCase {
'appforgroup1',
'appforgroup12',
'appforgroup2',
'cloud_federation_api',
'dav',
'federatedfilesharing',
'lookup_server_connector',
@ -501,11 +506,11 @@ class AppTest extends \Test\TestCase {
);
$apps = \OC_App::getEnabledApps();
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
$this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
// mock should not be called again here
$apps = \OC_App::getEnabledApps();
$this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
$this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
$this->restoreAppConfig();
\OC_User::setUserId(null);