Fix share tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 48 insertions, 1 deletions

diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
index 0616daed62d..5cf3906e565 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);
@@ -1357,6 +1394,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();
 
@@ -1385,6 +1426,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();