Merge pull request #18011 from nextcloud/fix/share_tests
Fix/share tests
This commit is contained in:
commit
c4ef32f4f0
|
@ -42,6 +42,7 @@ use OCP\IConfig;
|
||||||
use OCP\IL10N;
|
use OCP\IL10N;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
use OCP\IServerContainer;
|
use OCP\IServerContainer;
|
||||||
|
use OCP\Share\IShare;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class ApiTest
|
* Class ApiTest
|
||||||
|
@ -384,6 +385,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(19);
|
->setPermissions(19);
|
||||||
$share1 = $this->shareManager->createShare($share1);
|
$share1 = $this->shareManager->createShare($share1);
|
||||||
|
$share1->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share1);
|
||||||
|
|
||||||
$node2 = $this->userFolder->get($this->folder);
|
$node2 = $this->userFolder->get($this->folder);
|
||||||
$share2 = $this->shareManager->newShare();
|
$share2 = $this->shareManager->newShare();
|
||||||
|
@ -393,6 +396,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(31);
|
->setPermissions(31);
|
||||||
$share2 = $this->shareManager->createShare($share2);
|
$share2 = $this->shareManager->createShare($share2);
|
||||||
|
$share2->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share2);
|
||||||
|
|
||||||
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$result = $ocs->getShares('true');
|
$result = $ocs->getShares('true');
|
||||||
|
@ -619,6 +624,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(31);
|
->setPermissions(31);
|
||||||
$share1 = $this->shareManager->createShare($share1);
|
$share1 = $this->shareManager->createShare($share1);
|
||||||
|
$share1->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share1);
|
||||||
|
|
||||||
$node2 = $this->userFolder->get($this->folder.'/'.$this->filename);
|
$node2 = $this->userFolder->get($this->folder.'/'.$this->filename);
|
||||||
$share2 = $this->shareManager->newShare();
|
$share2 = $this->shareManager->newShare();
|
||||||
|
@ -627,6 +634,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
||||||
->setPermissions(1);
|
->setPermissions(1);
|
||||||
$share2 = $this->shareManager->createShare($share2);
|
$share2 = $this->shareManager->createShare($share2);
|
||||||
|
$share2->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share2);
|
||||||
|
|
||||||
$node3 = $this->userFolder->get($this->folder.'/'.$this->subfolder.'/'.$this->filename);
|
$node3 = $this->userFolder->get($this->folder.'/'.$this->subfolder.'/'.$this->filename);
|
||||||
$share3 = $this->shareManager->newShare();
|
$share3 = $this->shareManager->newShare();
|
||||||
|
@ -635,6 +644,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
||||||
->setPermissions(1);
|
->setPermissions(1);
|
||||||
$share3 = $this->shareManager->createShare($share3);
|
$share3 = $this->shareManager->createShare($share3);
|
||||||
|
$share3->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share3);
|
||||||
|
|
||||||
$testValues=array(
|
$testValues=array(
|
||||||
array('query' => $this->folder,
|
array('query' => $this->folder,
|
||||||
|
@ -642,8 +653,8 @@ class ApiTest extends TestCase {
|
||||||
array('query' => $this->folder . $this->subfolder,
|
array('query' => $this->folder . $this->subfolder,
|
||||||
'expectedResult' => $this->folder . $this->subfolder . $this->filename),
|
'expectedResult' => $this->folder . $this->subfolder . $this->filename),
|
||||||
);
|
);
|
||||||
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();
|
||||||
|
@ -673,6 +684,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(31);
|
->setPermissions(31);
|
||||||
$share1 = $this->shareManager->createShare($share1);
|
$share1 = $this->shareManager->createShare($share1);
|
||||||
|
$share1->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share1);
|
||||||
|
|
||||||
$node2 = \OC::$server->getRootFolder()->getUserFolder(self::TEST_FILES_SHARING_API_USER2)->get($this->subfolder);
|
$node2 = \OC::$server->getRootFolder()->getUserFolder(self::TEST_FILES_SHARING_API_USER2)->get($this->subfolder);
|
||||||
$share2 = $this->shareManager->newShare();
|
$share2 = $this->shareManager->newShare();
|
||||||
|
@ -681,6 +694,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
||||||
->setPermissions(1);
|
->setPermissions(1);
|
||||||
$share2 = $this->shareManager->createShare($share2);
|
$share2 = $this->shareManager->createShare($share2);
|
||||||
|
$share2->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share2);
|
||||||
|
|
||||||
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$result = $ocs->getShares();
|
$result = $ocs->getShares();
|
||||||
|
@ -789,6 +804,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(31);
|
->setPermissions(31);
|
||||||
$share1 = $this->shareManager->createShare($share1);
|
$share1 = $this->shareManager->createShare($share1);
|
||||||
|
$share1->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share1);
|
||||||
|
|
||||||
$node2 = $this->userFolder->get($this->folder);
|
$node2 = $this->userFolder->get($this->folder);
|
||||||
$share2 = $this->shareManager->newShare();
|
$share2 = $this->shareManager->newShare();
|
||||||
|
@ -798,6 +815,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(31);
|
->setPermissions(31);
|
||||||
$share2 = $this->shareManager->createShare($share2);
|
$share2 = $this->shareManager->createShare($share2);
|
||||||
|
$share2->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share2);
|
||||||
|
|
||||||
$share3 = $this->shareManager->newShare();
|
$share3 = $this->shareManager->newShare();
|
||||||
$share3->setNode($node1)
|
$share3->setNode($node1)
|
||||||
|
@ -805,6 +824,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
||||||
->setPermissions(1);
|
->setPermissions(1);
|
||||||
$share3 = $this->shareManager->createShare($share3);
|
$share3 = $this->shareManager->createShare($share3);
|
||||||
|
$share3->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share3);
|
||||||
|
|
||||||
// $request = $this->createRequest(['path' => $this->subfolder]);
|
// $request = $this->createRequest(['path' => $this->subfolder]);
|
||||||
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -847,6 +868,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(31);
|
->setPermissions(31);
|
||||||
$share1 = $this->shareManager->createShare($share1);
|
$share1 = $this->shareManager->createShare($share1);
|
||||||
|
$share1->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share1);
|
||||||
|
|
||||||
$user2Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
|
$user2Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$node2 = $user2Folder->get($this->subfolder . $this->filename);
|
$node2 = $user2Folder->get($this->subfolder . $this->filename);
|
||||||
|
@ -857,6 +880,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(19);
|
->setPermissions(19);
|
||||||
$share2 = $this->shareManager->createShare($share2);
|
$share2 = $this->shareManager->createShare($share2);
|
||||||
|
$share2->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share2);
|
||||||
|
|
||||||
$user3Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER3);
|
$user3Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER3);
|
||||||
$node3 = $user3Folder->get($this->filename);
|
$node3 = $user3Folder->get($this->filename);
|
||||||
|
@ -866,6 +891,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
||||||
->setPermissions(1);
|
->setPermissions(1);
|
||||||
$share3 = $this->shareManager->createShare($share3);
|
$share3 = $this->shareManager->createShare($share3);
|
||||||
|
$share3->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share3);
|
||||||
|
|
||||||
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER3);
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER3);
|
||||||
$result = $ocs->getShares();
|
$result = $ocs->getShares();
|
||||||
|
@ -993,6 +1020,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
||||||
->setPermissions(1);
|
->setPermissions(1);
|
||||||
$share1 = $this->shareManager->createShare($share1);
|
$share1 = $this->shareManager->createShare($share1);
|
||||||
|
$share1->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share1);
|
||||||
|
|
||||||
$config = \OC::$server->getConfig();
|
$config = \OC::$server->getConfig();
|
||||||
|
|
||||||
|
@ -1098,6 +1127,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setPermissions(31);
|
->setPermissions(31);
|
||||||
$share1 = $this->shareManager->createShare($share1);
|
$share1 = $this->shareManager->createShare($share1);
|
||||||
|
$share1->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share1);
|
||||||
|
|
||||||
$user2folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
|
$user2folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$node2 = $user2folder->get($this->folder.'/'.$this->filename);
|
$node2 = $user2folder->get($this->folder.'/'.$this->filename);
|
||||||
|
@ -1107,6 +1138,8 @@ class ApiTest extends TestCase {
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
|
||||||
->setPermissions(1);
|
->setPermissions(1);
|
||||||
$share2 = $this->shareManager->createShare($share2);
|
$share2 = $this->shareManager->createShare($share2);
|
||||||
|
$share2->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share2);
|
||||||
|
|
||||||
// test if we can unshare the link again
|
// test if we can unshare the link again
|
||||||
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -1131,6 +1164,8 @@ class ApiTest extends TestCase {
|
||||||
self::TEST_FILES_SHARING_API_USER2,
|
self::TEST_FILES_SHARING_API_USER2,
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
// user2 shares a file from the folder as link
|
// user2 shares a file from the folder as link
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -1203,6 +1238,8 @@ class ApiTest extends TestCase {
|
||||||
self::TEST_FILES_SHARING_API_USER2,
|
self::TEST_FILES_SHARING_API_USER2,
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
// user2: check that mount point name appears correctly
|
// user2: check that mount point name appears correctly
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -1356,6 +1393,10 @@ class ApiTest extends TestCase {
|
||||||
|
|
||||||
$topId = $data['id'];
|
$topId = $data['id'];
|
||||||
|
|
||||||
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
$ocs->acceptShare($topId);
|
||||||
|
$ocs->cleanup();
|
||||||
|
|
||||||
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
|
$ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
|
||||||
$ocs->cleanup();
|
$ocs->cleanup();
|
||||||
|
@ -1384,6 +1425,12 @@ class ApiTest extends TestCase {
|
||||||
|
|
||||||
$topId = $data['id'];
|
$topId = $data['id'];
|
||||||
|
|
||||||
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
$ocs->acceptShare($topId);
|
||||||
|
$ocs->cleanup();
|
||||||
|
|
||||||
|
\OC_Util::tearDownFS();
|
||||||
|
|
||||||
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
|
$ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
|
||||||
$ocs->cleanup();
|
$ocs->cleanup();
|
||||||
|
|
|
@ -33,6 +33,7 @@ namespace OCA\Files_Sharing\Tests;
|
||||||
use OC\Files\Storage\Temporary;
|
use OC\Files\Storage\Temporary;
|
||||||
use OC\Files\Storage\Wrapper\Jail;
|
use OC\Files\Storage\Wrapper\Jail;
|
||||||
use OCA\Files_Sharing\SharedStorage;
|
use OCA\Files_Sharing\SharedStorage;
|
||||||
|
use OCP\Share\IShare;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class CacheTest
|
* Class CacheTest
|
||||||
|
@ -103,7 +104,9 @@ class CacheTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
$node = $rootFolder->get('container/shared single file.txt');
|
$node = $rootFolder->get('container/shared single file.txt');
|
||||||
$share = $this->shareManager->newShare();
|
$share = $this->shareManager->newShare();
|
||||||
|
@ -112,7 +115,9 @@ class CacheTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE));
|
->setPermissions(\OCP\Constants::PERMISSION_ALL & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE));
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
// login as user2
|
// login as user2
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -313,6 +318,8 @@ class CacheTest extends TestCase {
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$share = $this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER3);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER3);
|
||||||
|
|
||||||
|
@ -396,7 +403,9 @@ class CacheTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
|
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
\OC_Util::tearDownFS();
|
\OC_Util::tearDownFS();
|
||||||
|
|
||||||
|
@ -427,7 +436,9 @@ class CacheTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
\OC_Util::tearDownFS();
|
\OC_Util::tearDownFS();
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -454,7 +465,9 @@ class CacheTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
\OC_Util::tearDownFS();
|
\OC_Util::tearDownFS();
|
||||||
|
|
||||||
list($sourceStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/foo');
|
list($sourceStorage) = \OC\Files\Filesystem::resolvePath('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/foo');
|
||||||
|
@ -489,7 +502,9 @@ class CacheTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
\OC_Util::tearDownFS();
|
\OC_Util::tearDownFS();
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
|
@ -78,23 +78,28 @@ class EtagPropagationTest extends PropagationTestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
|
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
|
||||||
$shareManager->createShare($share);
|
$share = $shareManager->createShare($share);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER2);
|
||||||
$node = $rootFolder->getUserFolder(self::TEST_FILES_SHARING_API_USER1)
|
$node = $rootFolder->getUserFolder(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->get('/sub1/sub2/folder');
|
->get('/sub1/sub2/folder');
|
||||||
|
|
||||||
$share = $shareManager->newShare();
|
$share = $shareManager->newShare();
|
||||||
$share->setNode($node)
|
$share->setNode($node)
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$shareManager->createShare($share);
|
$share = $shareManager->createShare($share);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
$share = $shareManager->newShare();
|
$share = $shareManager->newShare();
|
||||||
$share->setNode($node)
|
$share->setNode($node)
|
||||||
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
->setShareType(\OCP\Share::SHARE_TYPE_USER)
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER3)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER3)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$shareManager->createShare($share);
|
$share = $shareManager->createShare($share);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER3);
|
||||||
|
|
||||||
$folderInfo = $view1->getFileInfo('/directReshare');
|
$folderInfo = $view1->getFileInfo('/directReshare');
|
||||||
$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
|
$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
|
||||||
|
@ -107,7 +112,8 @@ class EtagPropagationTest extends PropagationTestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$shareManager->createShare($share);
|
$share = $shareManager->createShare($share);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER1][''] = $view1->getFileInfo('')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER1][''] = $view1->getFileInfo('')->getId();
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER1]['sub1'] = $view1->getFileInfo('sub1')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER1]['sub1'] = $view1->getFileInfo('sub1')->getId();
|
||||||
|
@ -131,7 +137,8 @@ class EtagPropagationTest extends PropagationTestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER4)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER4)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$shareManager->createShare($share);
|
$share = $shareManager->createShare($share);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER4);
|
||||||
|
|
||||||
$folderInfo = $view2->getFileInfo('/directReshare');
|
$folderInfo = $view2->getFileInfo('/directReshare');
|
||||||
$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
|
$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
|
||||||
|
@ -144,7 +151,8 @@ class EtagPropagationTest extends PropagationTestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER4)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER4)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$shareManager->createShare($share);
|
$share = $shareManager->createShare($share);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER4);
|
||||||
|
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER2][''] = $view2->getFileInfo('')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER2][''] = $view2->getFileInfo('')->getId();
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER2]['sub1'] = $view2->getFileInfo('sub1')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER2]['sub1'] = $view2->getFileInfo('sub1')->getId();
|
||||||
|
|
|
@ -52,13 +52,14 @@ class GroupEtagPropagationTest extends PropagationTestCase {
|
||||||
$view1 = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
|
$view1 = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
|
||||||
$view1->mkdir('/test/sub');
|
$view1->mkdir('/test/sub');
|
||||||
|
|
||||||
$this->share(
|
$share = $this->share(
|
||||||
\OCP\Share::SHARE_TYPE_GROUP,
|
\OCP\Share::SHARE_TYPE_GROUP,
|
||||||
'/test',
|
'/test',
|
||||||
self::TEST_FILES_SHARING_API_USER1,
|
self::TEST_FILES_SHARING_API_USER1,
|
||||||
'group1',
|
'group1',
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER2);
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER1][''] = $view1->getFileInfo('')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER1][''] = $view1->getFileInfo('')->getId();
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER1]['test'] = $view1->getFileInfo('test')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER1]['test'] = $view1->getFileInfo('test')->getId();
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER1]['test/sub'] = $view1->getFileInfo('test/sub')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER1]['test/sub'] = $view1->getFileInfo('test/sub')->getId();
|
||||||
|
@ -66,20 +67,22 @@ class GroupEtagPropagationTest extends PropagationTestCase {
|
||||||
$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
|
$this->loginAsUser(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$view2 = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
|
$view2 = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
|
||||||
|
|
||||||
$this->share(
|
$share = $this->share(
|
||||||
\OCP\Share::SHARE_TYPE_GROUP,
|
\OCP\Share::SHARE_TYPE_GROUP,
|
||||||
'/test',
|
'/test',
|
||||||
self::TEST_FILES_SHARING_API_USER2,
|
self::TEST_FILES_SHARING_API_USER2,
|
||||||
'group2',
|
'group2',
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
$this->share(
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER3);
|
||||||
|
$share = $this->share(
|
||||||
\OCP\Share::SHARE_TYPE_GROUP,
|
\OCP\Share::SHARE_TYPE_GROUP,
|
||||||
'/test/sub',
|
'/test/sub',
|
||||||
self::TEST_FILES_SHARING_API_USER2,
|
self::TEST_FILES_SHARING_API_USER2,
|
||||||
'group3',
|
'group3',
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER4);
|
||||||
|
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER2][''] = $view2->getFileInfo('')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER2][''] = $view2->getFileInfo('')->getId();
|
||||||
$this->fileIds[self::TEST_FILES_SHARING_API_USER2]['test'] = $view2->getFileInfo('test')->getId();
|
$this->fileIds[self::TEST_FILES_SHARING_API_USER2]['test'] = $view2->getFileInfo('test')->getId();
|
||||||
|
|
|
@ -31,6 +31,7 @@ namespace OCA\Files_Sharing\Tests;
|
||||||
use OC\Files\Cache\Cache;
|
use OC\Files\Cache\Cache;
|
||||||
use OC\Files\Storage\Storage;
|
use OC\Files\Storage\Storage;
|
||||||
use OC\Files\View;
|
use OC\Files\View;
|
||||||
|
use OCP\Share\IShare;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class PermissionsTest
|
* Class PermissionsTest
|
||||||
|
@ -89,7 +90,9 @@ class PermissionsTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
$node = $rootFolder->get('container/shareddirrestricted');
|
$node = $rootFolder->get('container/shareddirrestricted');
|
||||||
$share = $this->shareManager->newShare();
|
$share = $this->shareManager->newShare();
|
||||||
|
@ -98,7 +101,9 @@ class PermissionsTest extends TestCase {
|
||||||
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
|
||||||
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE);
|
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE);
|
||||||
$this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($share);
|
||||||
|
|
||||||
// login as user2
|
// login as user2
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
|
@ -91,6 +91,8 @@ class ShareTest extends TestCase {
|
||||||
'testGroup',
|
'testGroup',
|
||||||
\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE
|
\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share2, self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
$this->shareManager->acceptShare($share2, self::TEST_FILES_SHARING_API_USER3);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename));
|
$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename));
|
||||||
|
|
|
@ -87,6 +87,7 @@ class SharedMountTest extends TestCase {
|
||||||
self::TEST_FILES_SHARING_API_USER1,
|
self::TEST_FILES_SHARING_API_USER1,
|
||||||
self::TEST_FILES_SHARING_API_USER2,
|
self::TEST_FILES_SHARING_API_USER2,
|
||||||
\OCP\Constants::PERMISSION_ALL);
|
\OCP\Constants::PERMISSION_ALL);
|
||||||
|
$this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
$share->setTarget('/foo/bar' . $this->folder);
|
$share->setTarget('/foo/bar' . $this->folder);
|
||||||
$this->shareManager->moveShare($share, self::TEST_FILES_SHARING_API_USER2);
|
$this->shareManager->moveShare($share, self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -200,6 +201,9 @@ class SharedMountTest extends TestCase {
|
||||||
'testGroup',
|
'testGroup',
|
||||||
\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE
|
\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share, $user1->getUID());
|
||||||
|
$this->shareManager->acceptShare($share, $user2->getUID());
|
||||||
|
$this->shareManager->acceptShare($share, $user3->getUID());
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
|
@ -348,6 +352,9 @@ class SharedMountTest extends TestCase {
|
||||||
'testGroup',
|
'testGroup',
|
||||||
$beforePerm
|
$beforePerm
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share, $user1->getUID());
|
||||||
|
$this->shareManager->acceptShare($share, $user2->getUID());
|
||||||
|
$this->shareManager->acceptShare($share, $user3->getUID());
|
||||||
|
|
||||||
// Login as user 2 and verify the item exists
|
// Login as user 2 and verify the item exists
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
@ -409,6 +416,9 @@ class SharedMountTest extends TestCase {
|
||||||
'testGroup',
|
'testGroup',
|
||||||
\OCP\Constants::PERMISSION_READ
|
\OCP\Constants::PERMISSION_READ
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share, $user1->getUID());
|
||||||
|
$this->shareManager->acceptShare($share, $user2->getUID());
|
||||||
|
$this->shareManager->acceptShare($share, $user3->getUID());
|
||||||
|
|
||||||
// Login as user 2 and verify the item exists
|
// Login as user 2 and verify the item exists
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
|
@ -507,6 +507,7 @@ class SharedStorageTest extends TestCase {
|
||||||
self::TEST_FILES_SHARING_API_GROUP1,
|
self::TEST_FILES_SHARING_API_GROUP1,
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share1, self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
|
@ -519,6 +520,7 @@ class SharedStorageTest extends TestCase {
|
||||||
self::TEST_FILES_SHARING_API_GROUP1,
|
self::TEST_FILES_SHARING_API_GROUP1,
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
|
$this->shareManager->acceptShare($share2, self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
$view2 = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
|
$view2 = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
|
||||||
|
|
|
@ -34,6 +34,7 @@ namespace OCA\Files_Sharing\Tests;
|
||||||
use OC\Files\Cache\Scanner;
|
use OC\Files\Cache\Scanner;
|
||||||
use OC\Files\Filesystem;
|
use OC\Files\Filesystem;
|
||||||
use OCA\Files_Sharing\AppInfo\Application;
|
use OCA\Files_Sharing\AppInfo\Application;
|
||||||
|
use OCP\Share\IShare;
|
||||||
use Test\Traits\MountProviderTrait;
|
use Test\Traits\MountProviderTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -240,6 +241,8 @@ abstract class TestCase extends \Test\TestCase {
|
||||||
->setNode($node)
|
->setNode($node)
|
||||||
->setPermissions($permissions);
|
->setPermissions($permissions);
|
||||||
$share = $this->shareManager->createShare($share);
|
$share = $this->shareManager->createShare($share);
|
||||||
|
$share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$share = $this->shareManager->updateShare($share);
|
||||||
|
|
||||||
return $share;
|
return $share;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,8 @@
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Tests;
|
namespace OCA\Files_Sharing\Tests;
|
||||||
|
|
||||||
|
use OCP\Share\IShare;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class WatcherTest
|
* Class WatcherTest
|
||||||
*
|
*
|
||||||
|
@ -74,6 +76,9 @@ class WatcherTest extends TestCase {
|
||||||
\OCP\Constants::PERMISSION_ALL
|
\OCP\Constants::PERMISSION_ALL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$this->_share->setStatus(IShare::STATUS_ACCEPTED);
|
||||||
|
$this->shareManager->updateShare($this->_share);
|
||||||
|
|
||||||
// login as user2
|
// login as user2
|
||||||
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,8 @@ class StorageTest extends \Test\TestCase {
|
||||||
->setSharedBy($this->user)
|
->setSharedBy($this->user)
|
||||||
->setSharedWith($recipientUser)
|
->setSharedWith($recipientUser)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
\OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, $recipientUser);
|
||||||
|
|
||||||
$this->loginAsUser($recipientUser);
|
$this->loginAsUser($recipientUser);
|
||||||
|
|
||||||
|
@ -335,7 +336,8 @@ class StorageTest extends \Test\TestCase {
|
||||||
->setSharedBy($this->user)
|
->setSharedBy($this->user)
|
||||||
->setSharedWith($recipientUser)
|
->setSharedWith($recipientUser)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
\OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, $recipientUser);
|
||||||
|
|
||||||
$this->loginAsUser($recipientUser);
|
$this->loginAsUser($recipientUser);
|
||||||
|
|
||||||
|
|
|
@ -227,7 +227,8 @@ class TrashbinTest extends \Test\TestCase {
|
||||||
->setSharedBy(self::TEST_TRASHBIN_USER1)
|
->setSharedBy(self::TEST_TRASHBIN_USER1)
|
||||||
->setSharedWith(self::TEST_TRASHBIN_USER2)
|
->setSharedWith(self::TEST_TRASHBIN_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
\OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, self::TEST_TRASHBIN_USER2);
|
||||||
|
|
||||||
// delete them so that they end up in the trash bin
|
// delete them so that they end up in the trash bin
|
||||||
\OC\Files\Filesystem::unlink($folder . 'user1-1.txt');
|
\OC\Files\Filesystem::unlink($folder . 'user1-1.txt');
|
||||||
|
|
|
@ -37,6 +37,7 @@ require_once __DIR__ . '/../appinfo/app.php';
|
||||||
|
|
||||||
use OC\Files\Storage\Temporary;
|
use OC\Files\Storage\Temporary;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
|
use OCP\Share\IShare;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Test_Files_versions
|
* Class Test_Files_versions
|
||||||
|
@ -325,6 +326,7 @@ class VersioningTest extends \Test\TestCase {
|
||||||
->setSharedWith(self::TEST_VERSIONS_USER2)
|
->setSharedWith(self::TEST_VERSIONS_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$share = \OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_VERSIONS_USER2);
|
self::loginHelper(self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
|
@ -393,6 +395,7 @@ class VersioningTest extends \Test\TestCase {
|
||||||
->setSharedWith(self::TEST_VERSIONS_USER2)
|
->setSharedWith(self::TEST_VERSIONS_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$share = \OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_VERSIONS_USER2);
|
self::loginHelper(self::TEST_VERSIONS_USER2);
|
||||||
$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
|
$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
|
||||||
|
@ -442,6 +445,7 @@ class VersioningTest extends \Test\TestCase {
|
||||||
->setSharedWith(self::TEST_VERSIONS_USER2)
|
->setSharedWith(self::TEST_VERSIONS_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$share = \OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_VERSIONS_USER2);
|
self::loginHelper(self::TEST_VERSIONS_USER2);
|
||||||
$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
|
$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
|
||||||
|
@ -509,6 +513,7 @@ class VersioningTest extends \Test\TestCase {
|
||||||
->setSharedWith(self::TEST_VERSIONS_USER2)
|
->setSharedWith(self::TEST_VERSIONS_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
|
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
|
||||||
$share = \OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
self::loginHelper(self::TEST_VERSIONS_USER2);
|
self::loginHelper(self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
|
@ -653,6 +658,7 @@ class VersioningTest extends \Test\TestCase {
|
||||||
->setSharedWith(self::TEST_VERSIONS_USER2)
|
->setSharedWith(self::TEST_VERSIONS_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_READ);
|
->setPermissions(\OCP\Constants::PERMISSION_READ);
|
||||||
$share = \OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
$versions = $this->createAndCheckVersions(
|
$versions = $this->createAndCheckVersions(
|
||||||
\OC\Files\Filesystem::getView(),
|
\OC\Files\Filesystem::getView(),
|
||||||
|
@ -823,6 +829,7 @@ class VersioningTest extends \Test\TestCase {
|
||||||
->setSharedWith(self::TEST_VERSIONS_USER2)
|
->setSharedWith(self::TEST_VERSIONS_USER2)
|
||||||
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
->setPermissions(\OCP\Constants::PERMISSION_ALL);
|
||||||
$share = \OC::$server->getShareManager()->createShare($share);
|
$share = \OC::$server->getShareManager()->createShare($share);
|
||||||
|
\OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
$this->loginAsUser(self::TEST_VERSIONS_USER2);
|
$this->loginAsUser(self::TEST_VERSIONS_USER2);
|
||||||
|
|
||||||
|
|
|
@ -177,7 +177,8 @@ class Dummy extends Backend {
|
||||||
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
|
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
|
||||||
if(isset($this->groups[$gid])) {
|
if(isset($this->groups[$gid])) {
|
||||||
if(empty($search)) {
|
if(empty($search)) {
|
||||||
return $this->groups[$gid];
|
$length = $limit < 0 ? null : $limit;
|
||||||
|
return array_slice($this->groups[$gid], $offset, $length);
|
||||||
}
|
}
|
||||||
$result = array();
|
$result = array();
|
||||||
foreach($this->groups[$gid] as $user) {
|
foreach($this->groups[$gid] as $user) {
|
||||||
|
|
Loading…
Reference in New Issue