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

Fix ExpiresSharesJobTest 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-03-16 14:59:11 +01:00 committed by Morris Jobke
parent c5042f1545
commit 33b639d23c
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/files_sharing/tests/ExpireSharesJobTest.php
View File

@ -133,15 +133,18 @@ class ExpireSharesJobTest extends \Test\TestCase {
public function testExpireLinkShare($addExpiration, $interval, $addInterval, $shouldExpire) { public function testExpireLinkShare($addExpiration, $interval, $addInterval, $shouldExpire) {
$this->loginAsUser($this->user1); $this->loginAsUser($this->user1);
$view = new \OC\Files\View('/' . $this->user1 . '/'); $user1Folder = \OC::$server->getUserFolder($this->user1);
$view->mkdir('files/test'); $testFolder = $user1Folder->newFolder('test');
$fileInfo = $view->getFileInfo('files/test'); $shareManager = \OC::$server->getShareManager();
$share = $shareManager->newShare();
$this->assertNotNull( $share->setNode($testFolder)
\OC\Share\Share::shareItem('folder', $fileInfo->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ), ->setShareType(\OCP\Share::SHARE_TYPE_LINK)
'Failed asserting that user 1 successfully shared "test" by link.' ->setPermissions(\OCP\Constants::PERMISSION_READ)
); ->setSharedBy($this->user1);
$shareManager->createShare($share);
$shares = $this->getShares(); $shares = $this->getShares();
$this->assertCount(1, $shares); $this->assertCount(1, $shares);
@ -187,20 +190,22 @@ class ExpireSharesJobTest extends \Test\TestCase {
public function testDoNotExpireOtherShares() { public function testDoNotExpireOtherShares() {
$this->loginAsUser($this->user1); $this->loginAsUser($this->user1);
$view = new \OC\Files\View('/' . $this->user1 . '/'); $user1Folder = \OC::$server->getUserFolder($this->user1);
$view->mkdir('files/test'); $testFolder = $user1Folder->newFolder('test');
$fileInfo = $view->getFileInfo('files/test'); $shareManager = \OC::$server->getShareManager();
$share = $shareManager->newShare();
$this->assertNotNull( $share->setNode($testFolder)
\OC\Share\Share::shareItem('folder', $fileInfo->getId(), \OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ), ->setShareType(\OCP\Share::SHARE_TYPE_USER)
'Failed asserting that user 1 successfully shared "test" by link with user2.' ->setPermissions(\OCP\Constants::PERMISSION_READ)
); ->setSharedBy($this->user1)
->setSharedWith($this->user2);
$shareManager->createShare($share);
$shares = $this->getShares(); $shares = $this->getShares();
$this->assertCount(1, $shares); $this->assertCount(1, $shares);
reset($shares);
$share = current($shares);
$this->logout(); $this->logout();