diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-12-11 09:52:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 09:52:05 +0300 |
| commit | 68d59915d6084c92799c22196012e32f7bb12be4 (patch) | |
| tree | 7337384a41b78ac202bd122e72a860b723a64fe2 | |
| parent | 46b2fef1126945225947a01df44dfab8a005e728 (diff) | |
| parent | edf88934793841f5628370d29c681c3e239d00ef (diff) | |
Merge pull request #18334 from nextcloud/enh/always_enable_viewer
Viewer should be always enabled
| -rw-r--r-- | build/integration/features/provisioning-v1.feature | 1 | ||||
| -rw-r--r-- | core/shipped.json | 1 | ||||
| -rw-r--r-- | tests/lib/App/AppManagerTest.php | 5 | ||||
| -rw-r--r-- | tests/lib/AppTest.php | 9 |
4 files changed, 14 insertions, 2 deletions
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index f8eae1b833b..2d6d4a9756a 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -344,6 +344,7 @@ Feature: provisioning | twofactor_backupcodes | | updatenotification | | user_ldap | + | viewer | | workflowengine | | files_external | | oauth2 | diff --git a/core/shipped.json b/core/shipped.json index cbe2c788822..da408d5a347 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -52,6 +52,7 @@ "oauth2", "settings", "twofactor_backupcodes", + "viewer", "workflowengine" ] } diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index b3437ad290c..11450667fcc 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -390,6 +390,7 @@ class AppManagerTest extends TestCase { 'test1', 'test3', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ]; $this->assertEquals($apps, $this->manager->getInstalledApps()); @@ -418,6 +419,7 @@ class AppManagerTest extends TestCase { 'test1', 'test3', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ]; $this->assertEquals($enabled, $this->manager->getEnabledAppsForUser($user)); @@ -444,6 +446,7 @@ class AppManagerTest extends TestCase { 'testnoversion' => ['id' => 'testnoversion', 'requiremin' => '8.2.0'], 'settings' => ['id' => 'settings'], 'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'], + 'viewer' => ['id' => 'viewer'], 'workflowengine' => ['id' => 'workflowengine'], 'oauth2' => ['id' => 'oauth2'], ]; @@ -494,6 +497,7 @@ class AppManagerTest extends TestCase { 'twofactor_backupcodes' => ['id' => 'twofactor_backupcodes'], 'workflowengine' => ['id' => 'workflowengine'], 'oauth2' => ['id' => 'oauth2'], + 'viewer' => ['id' => 'viewer'], ]; $manager->expects($this->any()) @@ -537,6 +541,7 @@ class AppManagerTest extends TestCase { 'test1', 'test3', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ]; $this->assertEquals($enabled, $this->manager->getEnabledAppsForGroup($group)); diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index a1f340075b8..4aac0d68318 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -346,6 +346,7 @@ class AppTest extends \Test\TestCase { 'provisioning_api', 'settings', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ), false @@ -367,6 +368,7 @@ class AppTest extends \Test\TestCase { 'provisioning_api', 'settings', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ), false @@ -389,6 +391,7 @@ class AppTest extends \Test\TestCase { 'provisioning_api', 'settings', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ), false @@ -411,6 +414,7 @@ class AppTest extends \Test\TestCase { 'provisioning_api', 'settings', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ), false, @@ -433,6 +437,7 @@ class AppTest extends \Test\TestCase { 'provisioning_api', 'settings', 'twofactor_backupcodes', + 'viewer', 'workflowengine', ), true, @@ -511,11 +516,11 @@ class AppTest extends \Test\TestCase { ); $apps = \OC_App::getEnabledApps(); - $this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'twofactor_backupcodes', 'workflowengine'), $apps); + $this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'twofactor_backupcodes', 'viewer', 'workflowengine'), $apps); // mock should not be called again here $apps = \OC_App::getEnabledApps(); - $this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'twofactor_backupcodes', 'workflowengine'), $apps); + $this->assertEquals(array('files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'twofactor_backupcodes', 'viewer', 'workflowengine'), $apps); $this->restoreAppConfig(); \OC_User::setUserId(null); |