From eb8ca3783c49ad432338735b47d17dba46ed3f7b Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 10 Dec 2019 15:08:19 +0100
Subject: [PATCH] Viewer should be always enabled
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
core/shipped.json | 1 +
tests/lib/App/AppManagerTest.php | 5 +++++
2 files changed, 6 insertions(+)
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));
--
GitLab