summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-11-06 15:52:49 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-11-06 16:05:34 +0100
commitcac2f7f4d69bfeeb0a1fbb011631593116a99518 (patch)
tree8ed9e438849a9f93929217b11b53f5fa929313af
parent98edf3612c90aaec6fa18169feb60aede9e7ea45 (diff)
downloadnextcloud-server-cac2f7f4d69bfeeb0a1fbb011631593116a99518.tar.gz
nextcloud-server-cac2f7f4d69bfeeb0a1fbb011631593116a99518.zip
Fix tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--apps/files/tests/Controller/ViewControllerTest.php11
-rw-r--r--apps/files_sharing/tests/Controller/ShareControllerTest.php6
2 files changed, 11 insertions, 6 deletions
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
index f11a6faf863..35fc1e74c1a 100644
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -131,12 +131,13 @@ class ViewControllerTest extends TestCase {
[$this->user->getUID(), 'files', 'file_sorting', 'name', 'name'],
[$this->user->getUID(), 'files', 'file_sorting_direction', 'asc', 'asc'],
[$this->user->getUID(), 'files', 'show_hidden', false, false],
+ [$this->user->getUID(), 'files', 'show_grid', true, true],
]));
- $this->config
- ->expects($this->any())
- ->method('getAppValue')
- ->will($this->returnArgument(2));
+ $this->config
+ ->expects($this->any())
+ ->method('getAppValue')
+ ->will($this->returnArgument(2));
$nav = new Template('files', 'appnavigation');
$nav->assign('usage_relative', 123);
@@ -366,6 +367,8 @@ class ViewControllerTest extends TestCase {
],
],
'hiddenFields' => [],
+ 'showgridview' => true,
+ 'isIE' => false,
]
);
$policy = new Http\ContentSecurityPolicy();
diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php
index c5306cbc0ce..564977c09bc 100644
--- a/apps/files_sharing/tests/Controller/ShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php
@@ -288,7 +288,8 @@ class ShareControllerTest extends \Test\TestCase {
'previewImage' => null,
'previewURL' => 'downloadURL',
'note' => $note,
- 'hideDownload' => false
+ 'hideDownload' => false,
+ 'showgridview' => true
);
$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
@@ -407,7 +408,8 @@ class ShareControllerTest extends \Test\TestCase {
'previewImage' => null,
'previewURL' => 'downloadURL',
'note' => $note,
- 'hideDownload' => true
+ 'hideDownload' => true,
+ 'showgridview' => true
);
$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();