diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
index 0616daed62db6958faae26f2085393804df766b0..5cf3906e565337f364c3214c00fef0e1e554ab9f 100644
--- a/apps/files_sharing/tests/ApiTest.php
+++ b/apps/files_sharing/tests/ApiTest.php
@@ -42,6 +42,7 @@ use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IServerContainer;
+use OCP\Share\IShare;
/**
* Class ApiTest
@@ -384,6 +385,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(19);
$share1 = $this->shareManager->createShare($share1);
+ $share1->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share1);
$node2 = $this->userFolder->get($this->folder);
$share2 = $this->shareManager->newShare();
@@ -393,6 +396,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(31);
$share2 = $this->shareManager->createShare($share2);
+ $share2->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share2);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
$result = $ocs->getShares('true');
@@ -619,6 +624,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(31);
$share1 = $this->shareManager->createShare($share1);
+ $share1->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share1);
$node2 = $this->userFolder->get($this->folder.'/'.$this->filename);
$share2 = $this->shareManager->newShare();
@@ -627,6 +634,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
->setPermissions(1);
$share2 = $this->shareManager->createShare($share2);
+ $share2->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share2);
$node3 = $this->userFolder->get($this->folder.'/'.$this->subfolder.'/'.$this->filename);
$share3 = $this->shareManager->newShare();
@@ -635,6 +644,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
->setPermissions(1);
$share3 = $this->shareManager->createShare($share3);
+ $share3->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share3);
$testValues=array(
array('query' => $this->folder,
@@ -642,8 +653,8 @@ class ApiTest extends TestCase {
array('query' => $this->folder . $this->subfolder,
'expectedResult' => $this->folder . $this->subfolder . $this->filename),
);
- foreach ($testValues as $value) {
+ foreach ($testValues as $value) {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
$result = $ocs->getShares('false', 'false', 'true', $value['query']);
$ocs->cleanup();
@@ -673,6 +684,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(31);
$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);
$share2 = $this->shareManager->newShare();
@@ -681,6 +694,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
->setPermissions(1);
$share2 = $this->shareManager->createShare($share2);
+ $share2->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share2);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
$result = $ocs->getShares();
@@ -789,6 +804,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(31);
$share1 = $this->shareManager->createShare($share1);
+ $share1->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share1);
$node2 = $this->userFolder->get($this->folder);
$share2 = $this->shareManager->newShare();
@@ -798,6 +815,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(31);
$share2 = $this->shareManager->createShare($share2);
+ $share2->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share2);
$share3 = $this->shareManager->newShare();
$share3->setNode($node1)
@@ -805,6 +824,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
->setPermissions(1);
$share3 = $this->shareManager->createShare($share3);
+ $share3->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share3);
// $request = $this->createRequest(['path' => $this->subfolder]);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
@@ -847,6 +868,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(31);
$share1 = $this->shareManager->createShare($share1);
+ $share1->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share1);
$user2Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
$node2 = $user2Folder->get($this->subfolder . $this->filename);
@@ -857,6 +880,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(19);
$share2 = $this->shareManager->createShare($share2);
+ $share2->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share2);
$user3Folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER3);
$node3 = $user3Folder->get($this->filename);
@@ -866,6 +891,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
->setPermissions(1);
$share3 = $this->shareManager->createShare($share3);
+ $share3->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share3);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER3);
$result = $ocs->getShares();
@@ -993,6 +1020,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
->setPermissions(1);
$share1 = $this->shareManager->createShare($share1);
+ $share1->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share1);
$config = \OC::$server->getConfig();
@@ -1098,6 +1127,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setPermissions(31);
$share1 = $this->shareManager->createShare($share1);
+ $share1->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share1);
$user2folder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER2);
$node2 = $user2folder->get($this->folder.'/'.$this->filename);
@@ -1107,6 +1138,8 @@ class ApiTest extends TestCase {
->setShareType(\OCP\Share::SHARE_TYPE_LINK)
->setPermissions(1);
$share2 = $this->shareManager->createShare($share2);
+ $share2->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share2);
// test if we can unshare the link again
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
@@ -1131,6 +1164,8 @@ class ApiTest extends TestCase {
self::TEST_FILES_SHARING_API_USER2,
\OCP\Constants::PERMISSION_ALL
);
+ $share->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share);
// user2 shares a file from the folder as link
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -1203,6 +1238,8 @@ class ApiTest extends TestCase {
self::TEST_FILES_SHARING_API_USER2,
\OCP\Constants::PERMISSION_ALL
);
+ $share->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share);
// user2: check that mount point name appears correctly
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -1356,6 +1393,10 @@ class ApiTest extends TestCase {
$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->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
$ocs->cleanup();
@@ -1384,6 +1425,12 @@ class ApiTest extends TestCase {
$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->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, \OCP\Share::SHARE_TYPE_LINK);
$ocs->cleanup();
diff --git a/apps/files_sharing/tests/CacheTest.php b/apps/files_sharing/tests/CacheTest.php
index 7bcb707a82ba2c6a5aa561959dcb0023020658f2..e8d8ae7f63ba415ec35e558635e63e59bae52f8e 100644
--- a/apps/files_sharing/tests/CacheTest.php
+++ b/apps/files_sharing/tests/CacheTest.php
@@ -33,6 +33,7 @@ namespace OCA\Files_Sharing\Tests;
use OC\Files\Storage\Temporary;
use OC\Files\Storage\Wrapper\Jail;
use OCA\Files_Sharing\SharedStorage;
+use OCP\Share\IShare;
/**
* Class CacheTest
@@ -103,7 +104,9 @@ class CacheTest extends TestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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');
$share = $this->shareManager->newShare();
@@ -112,7 +115,9 @@ class CacheTest extends TestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -313,6 +318,8 @@ class CacheTest extends TestCase {
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->setPermissions(\OCP\Constants::PERMISSION_ALL);
$share = $this->shareManager->createShare($share);
+ $share->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($share);
self::loginHelper(self::TEST_FILES_SHARING_API_USER3);
@@ -396,7 +403,9 @@ class CacheTest extends TestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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();
@@ -427,7 +436,9 @@ class CacheTest extends TestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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();
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -454,7 +465,9 @@ class CacheTest extends TestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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();
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)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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();
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
diff --git a/apps/files_sharing/tests/EtagPropagationTest.php b/apps/files_sharing/tests/EtagPropagationTest.php
index 4aba9e291134bb114cf1f49f1c5727650c6e2ad1..ee4ee19ce9f0d78759d6880a54798615b9806a81 100644
--- a/apps/files_sharing/tests/EtagPropagationTest.php
+++ b/apps/files_sharing/tests/EtagPropagationTest.php
@@ -78,23 +78,28 @@ class EtagPropagationTest extends PropagationTestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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)
->get('/sub1/sub2/folder');
+
$share = $shareManager->newShare();
$share->setNode($node)
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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->setNode($node)
->setShareType(\OCP\Share::SHARE_TYPE_USER)
->setSharedWith(self::TEST_FILES_SHARING_API_USER3)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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');
$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
@@ -107,7 +112,8 @@ class EtagPropagationTest extends PropagationTestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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]['sub1'] = $view1->getFileInfo('sub1')->getId();
@@ -131,7 +137,8 @@ class EtagPropagationTest extends PropagationTestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER4)
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
->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');
$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
@@ -144,7 +151,8 @@ class EtagPropagationTest extends PropagationTestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER4)
->setSharedBy(self::TEST_FILES_SHARING_API_USER2)
->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]['sub1'] = $view2->getFileInfo('sub1')->getId();
diff --git a/apps/files_sharing/tests/GroupEtagPropagationTest.php b/apps/files_sharing/tests/GroupEtagPropagationTest.php
index 206980659c7a718d9e2f4e959db8e9ed2095bcde..3304bf966bb671529860a79834214617b11d4f84 100644
--- a/apps/files_sharing/tests/GroupEtagPropagationTest.php
+++ b/apps/files_sharing/tests/GroupEtagPropagationTest.php
@@ -52,13 +52,14 @@ class GroupEtagPropagationTest extends PropagationTestCase {
$view1 = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
$view1->mkdir('/test/sub');
- $this->share(
+ $share = $this->share(
\OCP\Share::SHARE_TYPE_GROUP,
'/test',
self::TEST_FILES_SHARING_API_USER1,
'group1',
\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]['test'] = $view1->getFileInfo('test')->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);
$view2 = new View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
- $this->share(
+ $share = $this->share(
\OCP\Share::SHARE_TYPE_GROUP,
'/test',
self::TEST_FILES_SHARING_API_USER2,
'group2',
\OCP\Constants::PERMISSION_ALL
);
- $this->share(
+ $this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER3);
+ $share = $this->share(
\OCP\Share::SHARE_TYPE_GROUP,
'/test/sub',
self::TEST_FILES_SHARING_API_USER2,
'group3',
\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]['test'] = $view2->getFileInfo('test')->getId();
diff --git a/apps/files_sharing/tests/PermissionsTest.php b/apps/files_sharing/tests/PermissionsTest.php
index 5c0086646de3d21bf638920270a1c408a654dc4f..05a833025669700ee637b89aee50f4e7e4e9ea2e 100644
--- a/apps/files_sharing/tests/PermissionsTest.php
+++ b/apps/files_sharing/tests/PermissionsTest.php
@@ -31,6 +31,7 @@ namespace OCA\Files_Sharing\Tests;
use OC\Files\Cache\Cache;
use OC\Files\Storage\Storage;
use OC\Files\View;
+use OCP\Share\IShare;
/**
* Class PermissionsTest
@@ -89,7 +90,9 @@ class PermissionsTest extends TestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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');
$share = $this->shareManager->newShare();
@@ -98,7 +101,9 @@ class PermissionsTest extends TestCase {
->setSharedWith(self::TEST_FILES_SHARING_API_USER2)
->setSharedBy(self::TEST_FILES_SHARING_API_USER1)
->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
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php
index f89f478a97a9e6959ecefaadd542447b7c8bf64c..61bec2caea3437ba89ce706000019b33fa4f2098 100644
--- a/apps/files_sharing/tests/ShareTest.php
+++ b/apps/files_sharing/tests/ShareTest.php
@@ -91,6 +91,8 @@ class ShareTest extends TestCase {
'testGroup',
\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);
$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename));
@@ -176,14 +178,14 @@ class ShareTest extends TestCase {
$share = $shares[0];
$this->assertSame('/test.txt' ,$share->getTarget());
$this->assertSame(19, $share->getPermissions());
-
+
\OC\Files\Filesystem::rename('test.txt', 'new test.txt');
$shares = $this->shareManager->getSharedWith(self::TEST_FILES_SHARING_API_USER2, \OCP\Share::SHARE_TYPE_GROUP);
$share = $shares[0];
$this->assertSame('/new test.txt' ,$share->getTarget());
$this->assertSame(19, $share->getPermissions());
-
+
$share->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE);
$this->shareManager->updateShare($share);
diff --git a/apps/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php
index 1eddbcb64f7424e2689545be3112ccb566393dce..f01e9896efbba8fb3cf61c6cfd085c187768d3b8 100644
--- a/apps/files_sharing/tests/SharedMountTest.php
+++ b/apps/files_sharing/tests/SharedMountTest.php
@@ -87,6 +87,7 @@ class SharedMountTest extends TestCase {
self::TEST_FILES_SHARING_API_USER1,
self::TEST_FILES_SHARING_API_USER2,
\OCP\Constants::PERMISSION_ALL);
+ $this->shareManager->acceptShare($share, self::TEST_FILES_SHARING_API_USER2);
$share->setTarget('/foo/bar' . $this->folder);
$this->shareManager->moveShare($share, self::TEST_FILES_SHARING_API_USER2);
@@ -200,6 +201,9 @@ class SharedMountTest extends TestCase {
'testGroup',
\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);
@@ -284,7 +288,7 @@ class SharedMountTest extends TestCase {
if ($before === $after) { continue; }
$data[] = [
- 'file',
+ 'file',
$before,
$after,
];
@@ -348,6 +352,9 @@ class SharedMountTest extends TestCase {
'testGroup',
$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
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -386,7 +393,7 @@ class SharedMountTest extends TestCase {
}
/**
- * If the permissions on a group share are upgraded be sure to still respect
+ * If the permissions on a group share are upgraded be sure to still respect
* removed shares by a member of that group
*/
public function testPermissionUpgradeOnUserDeletedGroupShare() {
@@ -409,6 +416,9 @@ class SharedMountTest extends TestCase {
'testGroup',
\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
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -430,7 +440,7 @@ class SharedMountTest extends TestCase {
$share->setPermissions(\OCP\Constants::PERMISSION_ALL);
$share = $this->shareManager->updateShare($share);
- // Login as user 2 and verify
+ // Login as user 2 and verify
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
$this->assertFalse(\OC\Files\Filesystem::file_exists($this->folder));
$result = $this->shareManager->getShareById($share->getFullId(), self::TEST_FILES_SHARING_API_USER2);
diff --git a/apps/files_sharing/tests/SharedStorageTest.php b/apps/files_sharing/tests/SharedStorageTest.php
index c443aa9c45fd4fa63bd7d888426412e88bf08da6..b26af57fc11ebf114184c0fcc832ef4400b15e46 100644
--- a/apps/files_sharing/tests/SharedStorageTest.php
+++ b/apps/files_sharing/tests/SharedStorageTest.php
@@ -283,7 +283,7 @@ class SharedStorageTest extends TestCase {
$this->assertFalse($user2View->rename($this->folder . '/test-create.txt', $this->folder . '/newtarget.txt'));
$this->assertFalse($user2View->file_exists($this->folder . '/newtarget.txt'));
- // rename file not allowed if target exists
+ // rename file not allowed if target exists
$this->assertFalse($user2View->rename($this->folder . '/newtarget.txt', $this->folder . '/existing.txt'));
// overwriting file not allowed
@@ -507,6 +507,7 @@ class SharedStorageTest extends TestCase {
self::TEST_FILES_SHARING_API_GROUP1,
\OCP\Constants::PERMISSION_ALL
);
+ $this->shareManager->acceptShare($share1, 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,
\OCP\Constants::PERMISSION_ALL
);
+ $this->shareManager->acceptShare($share2, 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');
diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php
index e49b696e68a03fbf406726a7f67e4b5b430940ae..6c5f078f9e76782d3aac9ce35ebe5ca89185273a 100644
--- a/apps/files_sharing/tests/TestCase.php
+++ b/apps/files_sharing/tests/TestCase.php
@@ -34,6 +34,7 @@ namespace OCA\Files_Sharing\Tests;
use OC\Files\Cache\Scanner;
use OC\Files\Filesystem;
use OCA\Files_Sharing\AppInfo\Application;
+use OCP\Share\IShare;
use Test\Traits\MountProviderTrait;
/**
@@ -72,7 +73,7 @@ abstract class TestCase extends \Test\TestCase {
$application = new Application();
$application->registerMountProviders();
-
+
// reset backend
\OC_User::clearBackends();
\OC::$server->getGroupManager()->clearBackends();
@@ -240,6 +241,8 @@ abstract class TestCase extends \Test\TestCase {
->setNode($node)
->setPermissions($permissions);
$share = $this->shareManager->createShare($share);
+ $share->setStatus(IShare::STATUS_ACCEPTED);
+ $share = $this->shareManager->updateShare($share);
return $share;
}
diff --git a/apps/files_sharing/tests/WatcherTest.php b/apps/files_sharing/tests/WatcherTest.php
index e6ca5f40a8fa4b040be6b3f9d7dea51b8667d5de..59f84057a148c2e59f5d44fe63737efe1b6c9b93 100644
--- a/apps/files_sharing/tests/WatcherTest.php
+++ b/apps/files_sharing/tests/WatcherTest.php
@@ -29,6 +29,8 @@
namespace OCA\Files_Sharing\Tests;
+use OCP\Share\IShare;
+
/**
* Class WatcherTest
*
@@ -74,6 +76,9 @@ class WatcherTest extends TestCase {
\OCP\Constants::PERMISSION_ALL
);
+ $this->_share->setStatus(IShare::STATUS_ACCEPTED);
+ $this->shareManager->updateShare($this->_share);
+
// login as user2
self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php
index 3c660134d1c3e9d0d8e8d161e9e83b4ce3f408f7..7632915e002ee94cc9267a276ca73c16763327cc 100644
--- a/apps/files_trashbin/tests/StorageTest.php
+++ b/apps/files_trashbin/tests/StorageTest.php
@@ -282,7 +282,8 @@ class StorageTest extends \Test\TestCase {
->setSharedBy($this->user)
->setSharedWith($recipientUser)
->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);
@@ -335,7 +336,8 @@ class StorageTest extends \Test\TestCase {
->setSharedBy($this->user)
->setSharedWith($recipientUser)
->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);
diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php
index 22b6e87317ca517a08db3e91887b733416721c40..3b1fff31fe1a67de354bc30a2e127550c52ed4bc 100644
--- a/apps/files_trashbin/tests/TrashbinTest.php
+++ b/apps/files_trashbin/tests/TrashbinTest.php
@@ -227,7 +227,8 @@ class TrashbinTest extends \Test\TestCase {
->setSharedBy(self::TEST_TRASHBIN_USER1)
->setSharedWith(self::TEST_TRASHBIN_USER2)
->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
\OC\Files\Filesystem::unlink($folder . 'user1-1.txt');
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index b35eb9a62c0be7a4956050132ec37dfc030b3f85..b3023dbef65e99059c94720ee3039e059e7dc9a1 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -37,6 +37,7 @@ require_once __DIR__ . '/../appinfo/app.php';
use OC\Files\Storage\Temporary;
use OCP\IConfig;
+use OCP\Share\IShare;
/**
* Class Test_Files_versions
@@ -325,6 +326,7 @@ class VersioningTest extends \Test\TestCase {
->setSharedWith(self::TEST_VERSIONS_USER2)
->setPermissions(\OCP\Constants::PERMISSION_ALL);
$share = \OC::$server->getShareManager()->createShare($share);
+ \OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
self::loginHelper(self::TEST_VERSIONS_USER2);
@@ -393,6 +395,7 @@ class VersioningTest extends \Test\TestCase {
->setSharedWith(self::TEST_VERSIONS_USER2)
->setPermissions(\OCP\Constants::PERMISSION_ALL);
$share = \OC::$server->getShareManager()->createShare($share);
+ \OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
self::loginHelper(self::TEST_VERSIONS_USER2);
$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
@@ -442,6 +445,7 @@ class VersioningTest extends \Test\TestCase {
->setSharedWith(self::TEST_VERSIONS_USER2)
->setPermissions(\OCP\Constants::PERMISSION_ALL);
$share = \OC::$server->getShareManager()->createShare($share);
+ \OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
self::loginHelper(self::TEST_VERSIONS_USER2);
$versionsFolder2 = '/' . self::TEST_VERSIONS_USER2 . '/files_versions';
@@ -509,6 +513,7 @@ class VersioningTest extends \Test\TestCase {
->setSharedWith(self::TEST_VERSIONS_USER2)
->setPermissions(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE);
$share = \OC::$server->getShareManager()->createShare($share);
+ \OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
self::loginHelper(self::TEST_VERSIONS_USER2);
@@ -653,6 +658,7 @@ class VersioningTest extends \Test\TestCase {
->setSharedWith(self::TEST_VERSIONS_USER2)
->setPermissions(\OCP\Constants::PERMISSION_READ);
$share = \OC::$server->getShareManager()->createShare($share);
+ \OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
$versions = $this->createAndCheckVersions(
\OC\Files\Filesystem::getView(),
@@ -823,6 +829,7 @@ class VersioningTest extends \Test\TestCase {
->setSharedWith(self::TEST_VERSIONS_USER2)
->setPermissions(\OCP\Constants::PERMISSION_ALL);
$share = \OC::$server->getShareManager()->createShare($share);
+ \OC::$server->getShareManager()->acceptShare($share, self::TEST_VERSIONS_USER2);
$this->loginAsUser(self::TEST_VERSIONS_USER2);