]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix tests 4982/head
authorLukas Reschke <lukas@statuscode.ch>
Sat, 20 May 2017 18:58:36 +0000 (20:58 +0200)
committerMorris Jobke <hey@morrisjobke.de>
Sat, 20 May 2017 22:15:19 +0000 (17:15 -0500)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
tests/lib/App/AppManagerTest.php
tests/lib/AppTest.php

index bfb2893955f89697c0df70ba70994e6d8e6f0e17..c2c0ea55072fd7edf795df34c690840cd0d5d251 100644 (file)
@@ -140,7 +140,7 @@ class AppManagerTest extends TestCase {
                $this->assertEquals('no', $this->appConfig->getValue(
                        'some_random_name_which_i_hope_is_not_an_app', 'enabled', 'no'
                ));
-       }
+       }
 
        public function testEnableAppForGroups() {
                $groups = array(
@@ -333,6 +333,7 @@ class AppManagerTest extends TestCase {
                        'federatedfilesharing',
                        'files',
                        'lookup_server_connector',
+                       'oauth2',
                        'provisioning_api',
                        'test1',
                        'test3',
@@ -358,11 +359,12 @@ class AppManagerTest extends TestCase {
                        'federatedfilesharing',
                        'files',
                        'lookup_server_connector',
+                       'oauth2',
                        'provisioning_api',
                        'test1',
                        'test3',
                        'twofactor_backupcodes',
-                       'workflowengine'
+                       'workflowengine',
                ];
                $this->assertEquals($enabled, $this->manager->getEnabledAppsForUser($user));
        }
@@ -387,6 +389,7 @@ class AppManagerTest extends TestCase {
                        'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
                        'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
                        'workflowengine' => ['id' => 'workflowengine'],
+                       'oauth2' => ['id' => 'oauth2'],
                ];
 
                $manager->expects($this->any())
@@ -395,7 +398,7 @@ class AppManagerTest extends TestCase {
                                function($appId) use ($appInfos) {
                                        return $appInfos[$appId];
                                }
-               ));
+                       ));
 
                $this->appConfig->setValue('test1', 'enabled', 'yes');
                $this->appConfig->setValue('test1', 'installed_version', '1.0.0');
@@ -432,6 +435,7 @@ class AppManagerTest extends TestCase {
                        'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'],
                        'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'],
                        'workflowengine' => ['id' => 'workflowengine'],
+                       'oauth2' => ['id' => 'oauth2'],
                ];
 
                $manager->expects($this->any())
@@ -440,7 +444,7 @@ class AppManagerTest extends TestCase {
                                function($appId) use ($appInfos) {
                                        return $appInfos[$appId];
                                }
-               ));
+                       ));
 
                $this->appConfig->setValue('test1', 'enabled', 'yes');
                $this->appConfig->setValue('test2', 'enabled', 'yes');
index a60a03a07f55b343c68e1ecd6c05e34fbe70cef8..620e9344c4374da510f2f7c5fe1cb2a90652b9bf 100644 (file)
@@ -353,6 +353,7 @@ class AppTest extends \Test\TestCase {
                                        'dav',
                                        'federatedfilesharing',
                                        'lookup_server_connector',
+                                       'oauth2',
                                        'provisioning_api',
                                        'twofactor_backupcodes',
                                        'workflowengine',
@@ -371,6 +372,7 @@ class AppTest extends \Test\TestCase {
                                        'dav',
                                        'federatedfilesharing',
                                        'lookup_server_connector',
+                                       'oauth2',
                                        'provisioning_api',
                                        'twofactor_backupcodes',
                                        'workflowengine',
@@ -390,6 +392,7 @@ class AppTest extends \Test\TestCase {
                                        'dav',
                                        'federatedfilesharing',
                                        'lookup_server_connector',
+                                       'oauth2',
                                        'provisioning_api',
                                        'twofactor_backupcodes',
                                        'workflowengine',
@@ -409,6 +412,7 @@ class AppTest extends \Test\TestCase {
                                        'dav',
                                        'federatedfilesharing',
                                        'lookup_server_connector',
+                                       'oauth2',
                                        'provisioning_api',
                                        'twofactor_backupcodes',
                                        'workflowengine',
@@ -428,6 +432,7 @@ class AppTest extends \Test\TestCase {
                                        'dav',
                                        'federatedfilesharing',
                                        'lookup_server_connector',
+                                       'oauth2',
                                        'provisioning_api',
                                        'twofactor_backupcodes',
                                        'workflowengine',
@@ -508,11 +513,11 @@ class AppTest extends \Test\TestCase {
                        );
 
                $apps = \OC_App::getEnabledApps();
-               $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
+               $this->assertEquals(array('files', 'app3', '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', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
+               $this->assertEquals(array('files', 'app3', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'twofactor_backupcodes', 'workflowengine'), $apps);
 
                $this->restoreAppConfig();
                \OC_User::setUserId(null);