diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2018-07-11 10:21:00 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2018-07-11 10:21:00 +0200 |
| commit | 412f6a6eccd7b4b955d63922150dbe2104cd269d (patch) | |
| tree | 02abc1098df572ce6655f361664e514df56ed00f | |
| parent | 0c09f566c24e45b3d4dc91dc2bddc341e4f76fbd (diff) | |
| download | nextcloud-server-412f6a6eccd7b4b955d63922150dbe2104cd269d.tar.gz nextcloud-server-412f6a6eccd7b4b955d63922150dbe2104cd269d.zip | |
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| -rw-r--r-- | apps/files_sharing/lib/External/Manager.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/External/ManagerTest.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php index a3b037e4982..6a036b663d9 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -636,7 +636,7 @@ class Manager { $query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted` FROM `*PREFIX*share_external` - WHERE `user` = ? OR `user` IN (?)'; + WHERE (`user` = ? OR `user` IN (?))'; $parameters = [$this->uid, implode(',',$userGroups)]; if (!is_null($accepted)) { $query .= ' AND `accepted` = ?'; diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php index 753836dd58e..93c17ca10cf 100644 --- a/apps/files_sharing/tests/External/ManagerTest.php +++ b/apps/files_sharing/tests/External/ManagerTest.php @@ -138,6 +138,9 @@ class ManagerTest extends TestCase { $shareData3 = $shareData1; $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(1))->method('tryOCMEndPoint')->with('http://localhost', 'token3', -1, 'decline')->willReturn(false); |