open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests

Browse Source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/9282/head
Roeland Jago Douma 8 years ago
parent 3b34a77c58
commit 4d5a2cce8d
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 17 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      apps/files_sharing/lib/Controller/ShareAPIController.php
  2. 28
      apps/files_sharing/tests/Controller/ShareAPIControllerTest.php

4
apps/files_sharing/lib/Controller/ShareAPIController.php
Unescape View File

@ -546,7 +546,7 @@ class ShareAPIController extends OCSController {
* @return DataResponse
* @throws OCSBadRequestException
*/
private function getSharesInDir(Folder $folder): DataResponse {
private function getSharesInDir(Node $folder): DataResponse {
if (!($folder instanceof \OCP\Files\Folder)) {
throw new OCSBadRequestException($this->l->t('Not a directory'));
}
@ -617,6 +617,8 @@ class ShareAPIController extends OCSController {
}
}
$include_tags = $include_tags === 'true';
if ($shared_with_me === 'true') {
$result = $this->getSharedWithMe($path, $include_tags);
return $result;

28
apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
Unescape View File

@ -756,7 +756,7 @@ class ShareAPIControllerTest extends TestCase {
}))
->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_USER, 'validUser');
$this->assertInstanceOf(get_class($expected), $result);
@ -863,7 +863,7 @@ class ShareAPIControllerTest extends TestCase {
}))
->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_GROUP, 'validGroup');
$this->assertInstanceOf(get_class($expected), $result);
@ -998,7 +998,7 @@ class ShareAPIControllerTest extends TestCase {
})
)->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK, null, 'true', '', '');
$this->assertInstanceOf(get_class($expected), $result);
@ -1032,7 +1032,7 @@ class ShareAPIControllerTest extends TestCase {
})
)->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK, null, 'false', 'password', '');
$this->assertInstanceOf(get_class($expected), $result);
@ -1079,7 +1079,7 @@ class ShareAPIControllerTest extends TestCase {
})
)->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->createShare('valid-path', \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK, null, 'false', '', '2000-01-01');
$this->assertInstanceOf(get_class($expected), $result);
@ -1254,7 +1254,7 @@ class ShareAPIControllerTest extends TestCase {
$this->shareManager->method('getSharedWith')
->willReturn([]);
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, null, '', 'false', '');
$this->assertInstanceOf(get_class($expected), $result);
@ -1289,7 +1289,7 @@ class ShareAPIControllerTest extends TestCase {
$this->shareManager->method('getSharedWith')
->willReturn([]);
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, null, 'password', 'true', '2000-01-01');
$this->assertInstanceOf(get_class($expected), $result);
@ -1323,7 +1323,7 @@ class ShareAPIControllerTest extends TestCase {
})
)->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, $permissions, $password, $publicUpload, $expireDate);
$this->assertInstanceOf(get_class($expected), $result);
@ -1440,7 +1440,7 @@ class ShareAPIControllerTest extends TestCase {
})
)->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, null, 'newpassword', null, null);
$this->assertInstanceOf(get_class($expected), $result);
@ -1477,7 +1477,7 @@ class ShareAPIControllerTest extends TestCase {
})
)->will($this->returnArgument(0));
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, null, null, null, '2010-12-23');
$this->assertInstanceOf(get_class($expected), $result);
@ -1514,7 +1514,7 @@ class ShareAPIControllerTest extends TestCase {
$this->shareManager->method('getSharedWith')
->willReturn([]);
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, null, null, 'true', null);
$this->assertInstanceOf(get_class($expected), $result);
@ -1550,7 +1550,7 @@ class ShareAPIControllerTest extends TestCase {
$this->shareManager->method('getSharedWith')->willReturn([]);
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, 7, null, null, null);
$this->assertInstanceOf(get_class($expected), $result);
@ -1586,7 +1586,7 @@ class ShareAPIControllerTest extends TestCase {
$this->shareManager->method('getSharedWith')->willReturn([]);
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, 31, null, null, null);
$this->assertInstanceOf(get_class($expected), $result);
@ -1615,7 +1615,7 @@ class ShareAPIControllerTest extends TestCase {
$this->shareManager->method('getSharedWith')->willReturn([]);
$expected = new DataResponse(null);
$expected = new DataResponse([]);
$result = $ocs->updateShare(42, 31, null, null, null);
$this->assertInstanceOf(get_class($expected), $result);

Write Preview
Loading…
Cancel
Save