diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2018-06-29 11:46:09 +0300 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2018-07-02 13:43:43 +0300 |
| commit | 511a34b08f3c66dd354dc188eec4cbca170ad6a9 (patch) | |
| tree | 4eea74f4f47e04707a1dcd27072049dc98d65d46 | |
| parent | cdf8abb060c596fec937bdc7ec4f287b22b240a3 (diff) | |
always enable cloud federation api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| -rw-r--r-- | core/shipped.json | 2 | ||||
| -rw-r--r-- | tests/lib/App/AppManagerTest.php | 4 | ||||
| -rw-r--r-- | tests/lib/AppTest.php | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/core/shipped.json b/core/shipped.json index d31fff95cac..4caa8e0d175 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -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", diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index 35650054105..bea39d1bc16 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -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'], diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index 1334aa62f13..5d98dc7df57 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -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); |