mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix unit tests 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2018-07-11 10:21:00 +02:00
parent 0c09f566c2
commit 412f6a6ecc
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/lib/External/Manager.php vendored
View File

@ -636,7 +636,7 @@ class Manager {
$query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted` $query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
FROM `*PREFIX*share_external` FROM `*PREFIX*share_external`
WHERE `user` = ? OR `user` IN (?)'; WHERE (`user` = ? OR `user` IN (?))';
$parameters = [$this->uid, implode(',',$userGroups)]; $parameters = [$this->uid, implode(',',$userGroups)];
if (!is_null($accepted)) { if (!is_null($accepted)) {
$query .= ' AND `accepted` = ?'; $query .= ' AND `accepted` = ?';

3
apps/files_sharing/tests/External/ManagerTest.php vendored
View File

@ -138,6 +138,9 @@ class ManagerTest extends TestCase {
$shareData3 = $shareData1; $shareData3 = $shareData1;
$shareData3['token'] = 'token3'; $shareData3['token'] = 'token3';
$this->userManager->expects($this->any())->method('get')->willReturn($this->user);
$this->groupManager->expects($this->any())->method(('getUserGroups'))->willReturn([]);
$this->manager->expects($this->at(0))->method('tryOCMEndPoint')->with('http://localhost', 'token1', -1, 'accept')->willReturn(false); $this->manager->expects($this->at(0))->method('tryOCMEndPoint')->with('http://localhost', 'token1', -1, 'accept')->willReturn(false);
$this->manager->expects($this->at(1))->method('tryOCMEndPoint')->with('http://localhost', 'token3', -1, 'decline')->willReturn(false); $this->manager->expects($this->at(1))->method('tryOCMEndPoint')->with('http://localhost', 'token3', -1, 'decline')->willReturn(false);