summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-10-25 10:57:48 +0200
committerGitHub <noreply@github.com>2016-10-25 10:57:48 +0200
commit890f752a6b57598ee6b2088a615c41f60d697847 (patch)
tree191c38b854d23f34a285b6fab711c82b2d5ed1f7 /tests/lib
parent79706e0ddc6ab970d5709e89b8d0caec4d34662b (diff)
parent2aca56f207048e6dff44983fe4cd7af834e70b42 (diff)
downloadnextcloud-server-890f752a6b57598ee6b2088a615c41f60d697847.tar.gz
nextcloud-server-890f752a6b57598ee6b2088a615c41f60d697847.zip
Merge pull request #1452 from nextcloud/appconfig-endpoint
Appconfig endpoint
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/App/ManagerTest.php14
-rw-r--r--tests/lib/AppTest.php9
2 files changed, 20 insertions, 3 deletions
diff --git a/tests/lib/App/ManagerTest.php b/tests/lib/App/ManagerTest.php
index f3a91d4f5f4..e04f7c82375 100644
--- a/tests/lib/App/ManagerTest.php
+++ b/tests/lib/App/ManagerTest.php
@@ -306,7 +306,16 @@ class ManagerTest extends TestCase {
$this->appConfig->setValue('test1', 'enabled', 'yes');
$this->appConfig->setValue('test2', 'enabled', 'no');
$this->appConfig->setValue('test3', 'enabled', '["foo"]');
- $apps = ['dav', 'federatedfilesharing', 'files', 'test1', 'test3', 'twofactor_backupcodes', 'workflowengine'];
+ $apps = [
+ 'dav',
+ 'federatedfilesharing',
+ 'files',
+ 'provisioning_api',
+ 'test1',
+ 'test3',
+ 'twofactor_backupcodes',
+ 'workflowengine',
+ ];
$this->assertEquals($apps, $this->manager->getInstalledApps());
}
@@ -325,6 +334,7 @@ class ManagerTest extends TestCase {
'dav',
'federatedfilesharing',
'files',
+ 'provisioning_api',
'test1',
'test3',
'twofactor_backupcodes',
@@ -343,6 +353,7 @@ class ManagerTest extends TestCase {
'dav' => ['id' => 'dav'],
'files' => ['id' => 'files'],
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
+ 'provisioning_api' => ['id' => 'provisioning_api'],
'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '9.0.0'],
'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
@@ -386,6 +397,7 @@ class ManagerTest extends TestCase {
'dav' => ['id' => 'dav'],
'files' => ['id' => 'files'],
'federatedfilesharing' => ['id' => 'federatedfilesharing'],
+ 'provisioning_api' => ['id' => 'provisioning_api'],
'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '8.0.0'],
'test2' => ['id' => 'test2', 'version' => '1.0.0', 'requiremin' => '8.2.0'],
'test3' => ['id' => 'test3', 'version' => '1.2.4', 'requiremin' => '9.0.0'],
diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php
index ea4f328b63a..b7263adb78b 100644
--- a/tests/lib/AppTest.php
+++ b/tests/lib/AppTest.php
@@ -317,6 +317,7 @@ class AppTest extends \Test\TestCase {
'appforgroup12',
'dav',
'federatedfilesharing',
+ 'provisioning_api',
'twofactor_backupcodes',
'workflowengine',
),
@@ -333,6 +334,7 @@ class AppTest extends \Test\TestCase {
'appforgroup2',
'dav',
'federatedfilesharing',
+ 'provisioning_api',
'twofactor_backupcodes',
'workflowengine',
),
@@ -350,6 +352,7 @@ class AppTest extends \Test\TestCase {
'appforgroup2',
'dav',
'federatedfilesharing',
+ 'provisioning_api',
'twofactor_backupcodes',
'workflowengine',
),
@@ -367,6 +370,7 @@ class AppTest extends \Test\TestCase {
'appforgroup2',
'dav',
'federatedfilesharing',
+ 'provisioning_api',
'twofactor_backupcodes',
'workflowengine',
),
@@ -384,6 +388,7 @@ class AppTest extends \Test\TestCase {
'appforgroup2',
'dav',
'federatedfilesharing',
+ 'provisioning_api',
'twofactor_backupcodes',
'workflowengine',
),
@@ -463,11 +468,11 @@ class AppTest extends \Test\TestCase {
);
$apps = \OC_App::getEnabledApps();
- $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'twofactor_backupcodes', 'workflowengine'), $apps);
+ $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
// mock should not be called again here
$apps = \OC_App::getEnabledApps();
- $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'twofactor_backupcodes', 'workflowengine'), $apps);
+ $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
$this->restoreAppConfig();
\OC_User::setUserId(null);