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

fixing tests + avoid duplicate in getFormattedShares() 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2019-12-02 18:16:33 -01:00 committed by Roeland Jago Douma
parent 3a86b99256
commit f2c7ca4584
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_sharing/lib/Controller/ShareAPIController.php
View File

@ -759,15 +759,18 @@ class ShareAPIController extends OCSController {
$shares = $this->getSharesFromNode($viewer, $node, $reShares);
$formatted = $miniFormatted = [];
$known = $formatted = $miniFormatted = [];
$resharingRight = false;
foreach ($shares as $share) {
if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
continue;
}
$known[] = $share->getId();
try {
/** @var IShare $share */
$format = $this->formatShare($share, $node);
if ($share->getSharedWith() !== $this->currentUser) {
$formatted[] = $format;
}
$formatted[] = $format;
// let's also build a list of shares created
// by the current user only, in case

11
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
View File

@ -106,6 +106,9 @@ class ShareAPIControllerTest extends TestCase {
->expects($this->any())
->method('shareApiEnabled')
->willReturn(true);
$this->shareManager
->expects($this->any())
->method('shareProviderExists')->willReturn(true);
$this->groupManager = $this->createMock(IGroupManager::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->request = $this->createMock(IRequest::class);
@ -170,10 +173,10 @@ class ShareAPIControllerTest extends TestCase {
$this->expectExceptionMessage('Wrong share ID, share doesn\'t exist');
$this->shareManager
->expects($this->exactly(3))
->expects($this->exactly(5))
->method('getShareById')
->will($this->returnCallback(function($id) {
if ($id === 'ocinternal:42' || $id === 'ocRoomShare:42' || $id === 'ocFederatedSharing:42') {
if ($id === 'ocinternal:42' || $id === 'ocRoomShare:42' || $id === 'ocFederatedSharing:42' || $id === 'ocCircleShare:42' || $id === 'ocMailShare:42') {
throw new \OCP\Share\Exceptions\ShareNotFound();
} else {
throw new \Exception();
@ -1008,9 +1011,7 @@ class ShareAPIControllerTest extends TestCase {
[
],
[
$file1UserShareOwnerExpected,
$file1UserShareOwnerExpected,
$file1UserShareOwnerExpected,
$file1UserShareOwnerExpected
]
],
[