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

fix share tests not passing path 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-09-20 17:59:24 +02:00
parent 1b3b816a0a
commit 7d1e800c15
No known key found for this signature in database
GPG Key ID: 425003AC385454C5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_sharing/tests/ApiTest.php
View File

@ -628,7 +628,7 @@ class ApiTest extends TestCase {
); );
foreach ($testValues as $value) { foreach ($testValues as $value) {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2); $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
$result = $ocs->getShares('false', 'false', 'true', $value['query']); $result = $ocs->getShares('false', 'false', 'true', $value['query']);
$ocs->cleanup(); $ocs->cleanup();
@ -765,6 +765,7 @@ class ApiTest extends TestCase {
* @medium * @medium
*/ */
function testGetShareMultipleSharedFolder() { function testGetShareMultipleSharedFolder() {
$this->setUp();
$node1 = $this->userFolder->get($this->folder . $this->subfolder); $node1 = $this->userFolder->get($this->folder . $this->subfolder);
$share1 = $this->shareManager->newShare(); $share1 = $this->shareManager->newShare();
$share1->setNode($node1) $share1->setNode($node1)
@ -790,8 +791,9 @@ class ApiTest extends TestCase {
->setPermissions(1); ->setPermissions(1);
$share3 = $this->shareManager->createShare($share3); $share3 = $this->shareManager->createShare($share3);
// $request = $this->createRequest(['path' => $this->subfolder]);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2); $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
$result1 = $ocs->getShares(); $result1 = $ocs->getShares('false','false','false', $this->subfolder);
$ocs->cleanup(); $ocs->cleanup();
// test should return one share within $this->folder // test should return one share within $this->folder
@ -799,8 +801,9 @@ class ApiTest extends TestCase {
$this->assertCount(1, $data1); $this->assertCount(1, $data1);
$s1 = reset($data1); $s1 = reset($data1);
//$request = $this->createRequest(['path' => $this->folder.$this->subfolder]);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2); $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
$result2 = $ocs->getShares(); $result2 = $ocs->getShares('false', 'false', 'false', $this->folder . $this->subfolder);
$ocs->cleanup(); $ocs->cleanup();
// test should return one share within $this->folder // test should return one share within $this->folder
@ -808,7 +811,7 @@ class ApiTest extends TestCase {
$this->assertCount(1, $data2); $this->assertCount(1, $data2);
$s2 = reset($data2); $s2 = reset($data2);
$this->assertEquals($this->folder.$this->subfolder, $s1['path']); $this->assertEquals($this->subfolder, $s1['path']);
$this->assertEquals($this->folder.$this->subfolder, $s2['path']); $this->assertEquals($this->folder.$this->subfolder, $s2['path']);
$this->shareManager->deleteShare($share1); $this->shareManager->deleteShare($share1);