diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-04 12:07:25 +0100 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2016-02-08 11:30:48 +0100 |
| commit | fad85ad19f137e1a54773ab3a28a55d884f6058f (patch) | |
| tree | 778dade9fcf3044288f5d6468bbd6bc925fefbff /tests | |
| parent | 33c3f75dde7f81130b3beda2475b9efcd0e4ada5 (diff) | |
| download | nextcloud-server-fad85ad19f137e1a54773ab3a28a55d884f6058f.tar.gz nextcloud-server-fad85ad19f137e1a54773ab3a28a55d884f6058f.zip | |
Fix unit tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/app.php | 9 | ||||
| -rw-r--r-- | tests/lib/app/manager.php | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/lib/app.php b/tests/lib/app.php index 389c9e5d2cf..3fb42ea2382 100644 --- a/tests/lib/app.php +++ b/tests/lib/app.php @@ -312,6 +312,7 @@ class Test_App extends \Test\TestCase { 'appforgroup1', 'appforgroup12', 'dav', + 'federatedfilesharing', ), false ), @@ -325,6 +326,7 @@ class Test_App extends \Test\TestCase { 'appforgroup12', 'appforgroup2', 'dav', + 'federatedfilesharing', ), false ), @@ -339,6 +341,7 @@ class Test_App extends \Test\TestCase { 'appforgroup12', 'appforgroup2', 'dav', + 'federatedfilesharing', ), false ), @@ -353,6 +356,7 @@ class Test_App extends \Test\TestCase { 'appforgroup12', 'appforgroup2', 'dav', + 'federatedfilesharing', ), false, ), @@ -367,6 +371,7 @@ class Test_App extends \Test\TestCase { 'appforgroup12', 'appforgroup2', 'dav', + 'federatedfilesharing', ), true, ), @@ -444,11 +449,11 @@ class Test_App extends \Test\TestCase { ); $apps = \OC_App::getEnabledApps(true); - $this->assertEquals(array('files', 'app3', 'dav'), $apps); + $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing',), $apps); // mock should not be called again here $apps = \OC_App::getEnabledApps(false); - $this->assertEquals(array('files', 'app3', 'dav'), $apps); + $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing',), $apps); $this->restoreAppConfig(); \OC_User::setUserId(null); diff --git a/tests/lib/app/manager.php b/tests/lib/app/manager.php index f82f1049ce3..ee9b1f308ea 100644 --- a/tests/lib/app/manager.php +++ b/tests/lib/app/manager.php @@ -282,7 +282,7 @@ class Manager extends TestCase { $this->appConfig->setValue('test1', 'enabled', 'yes'); $this->appConfig->setValue('test2', 'enabled', 'no'); $this->appConfig->setValue('test3', 'enabled', '["foo"]'); - $this->assertEquals(['dav', 'files', 'test1', 'test3'], $this->manager->getInstalledApps()); + $this->assertEquals(['dav', 'federatedfilesharing', 'files', 'test1', 'test3'], $this->manager->getInstalledApps()); } public function testGetAppsForUser() { @@ -296,7 +296,7 @@ class Manager extends TestCase { $this->appConfig->setValue('test2', 'enabled', 'no'); $this->appConfig->setValue('test3', 'enabled', '["foo"]'); $this->appConfig->setValue('test4', 'enabled', '["asd"]'); - $this->assertEquals(['dav', 'files', 'test1', 'test3'], $this->manager->getEnabledAppsForUser($user)); + $this->assertEquals(['dav', 'federatedfilesharing', 'files', 'test1', 'test3'], $this->manager->getEnabledAppsForUser($user)); } public function testGetAppsNeedingUpgrade() { @@ -308,6 +308,7 @@ class Manager extends TestCase { $appInfos = [ 'dav' => ['id' => 'dav'], 'files' => ['id' => 'files'], + 'federatedfilesharing' => ['id' => 'federatedfilesharing'], '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'], @@ -348,6 +349,7 @@ class Manager extends TestCase { $appInfos = [ 'dav' => ['id' => 'dav'], 'files' => ['id' => 'files'], + 'federatedfilesharing' => ['id' => 'federatedfilesharing'], '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'], |