Skip to content

Viewer should be always enabled #18334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Dec 11, 2019
Merged

Viewer should be always enabled #18334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8ca37
Viewer should be always enabled
rullzer Dec 10, 2019
edf8893
Fix tests
skjnldsv Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix tests 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Dec 10, 2019
commit edf88934793841f5628370d29c681c3e239d00ef
1 change: 1 addition & 0 deletions build/integration/features/provisioning-v1.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ Feature: provisioning
| twofactor_backupcodes |
| updatenotification |
| user_ldap |
| viewer |
| workflowengine |
| files_external |
| oauth2 |
Expand Down
9 changes: 7 additions & 2 deletions tests/lib/AppTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ public function appConfigValuesProvider() {
'provisioning_api',
'settings',
'twofactor_backupcodes',
'viewer',
'workflowengine',
),
false
Expand All @@ -367,6 +368,7 @@ public function appConfigValuesProvider() {
'provisioning_api',
'settings',
'twofactor_backupcodes',
'viewer',
'workflowengine',
),
false
Expand All @@ -389,6 +391,7 @@ public function appConfigValuesProvider() {
'provisioning_api',
'settings',
'twofactor_backupcodes',
'viewer',
'workflowengine',
),
false
Expand All @@ -411,6 +414,7 @@ public function appConfigValuesProvider() {
'provisioning_api',
'settings',
'twofactor_backupcodes',
'viewer',
'workflowengine',
),
false,
Expand All @@ -433,6 +437,7 @@ public function appConfigValuesProvider() {
'provisioning_api',
'settings',
'twofactor_backupcodes',
'viewer',
'workflowengine',
),
true,
Expand Down Expand Up @@ -511,11 +516,11 @@ public function testEnabledAppsCache() {
);

$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);
Expand Down