Merge pull request #3664 from nextcloud/backport/stable23/2496

[stable23] Transfer ownership
2022-04-11 18:29:14 +02:00
parent 1bd62d7fa2 39784dc940
commit 541eeb0b06
27 changed files with 1863 additions and 1074 deletions
--- a/tests/unit/Service/AttachmentServiceTest.php
+++ b/tests/unit/Service/AttachmentServiceTest.php
@@ -110,8 +110,16 @@ class AttachmentServiceTest extends TestCase {
 		$this->cache = $this->createMock(ICache::class);
 		$this->cacheFactory->expects($this->any())->method('createDistributed')->willReturn($this->cache);

-		$this->appContainer->expects($this->at(0))->method('query')->with(FileService::class)->willReturn($this->attachmentServiceImpl);
-		$this->appContainer->expects($this->at(1))->method('query')->with(FilesAppService::class)->willReturn($this->filesAppServiceImpl);
+		$this->appContainer->expects($this->exactly(2))
+			->method('query')
+			->withConsecutive(
+				[FileService::class],
+				[FilesAppService::class]
+			)
+			->willReturnOnConsecutiveCalls(
+				$this->attachmentServiceImpl,
+				$this->filesAppServiceImpl
+			);

 		$this->application->expects($this->any())
 			->method('getContainer')
@@ -129,9 +137,18 @@ class AttachmentServiceTest extends TestCase {
 		$fileServiceMock = $this->createMock(FileService::class);
 		$fileAppServiceMock = $this->createMock(FilesAppService::class);

-		$appContainer->expects($this->at(0))->method('query')->with(FileService::class)->willReturn($fileServiceMock);
-		$appContainer->expects($this->at(1))->method('query')->with(FilesAppService::class)->willReturn($fileAppServiceMock);
-		$appContainer->expects($this->at(2))->method('query')->with(MyAttachmentService::class)->willReturn(new MyAttachmentService());
+		$appContainer->expects($this->exactly(3))
+			->method('query')
+			->withConsecutive(
+				[FileService::class],
+				[FilesAppService::class],
+				[MyAttachmentService::class]
+			)
+			->willReturnOnConsecutiveCalls(
+				$fileServiceMock,
+				$fileAppServiceMock,
+				new MyAttachmentService()
+			);

 		$application->expects($this->any())
 			->method('getContainer')
@@ -148,12 +165,24 @@ class AttachmentServiceTest extends TestCase {
 		$appContainer = $this->createMock(IAppContainer::class);
 		$fileServiceMock = $this->createMock(FileService::class);
 		$fileAppServiceMock = $this->createMock(FilesAppService::class);
-		$appContainer->expects($this->at(0))->method('query')->with(FileService::class)->willReturn($fileServiceMock);
-		$appContainer->expects($this->at(1))->method('query')->with(FilesAppService::class)->willReturn($fileAppServiceMock);
-		$appContainer->expects($this->at(2))->method('query')->with(MyAttachmentService::class)->willReturn(new MyAttachmentService());
+
+		$appContainer->expects($this->exactly(3))
+			->method('query')
+			->withConsecutive(
+				[FileService::class],
+				[FilesAppService::class],
+				[MyAttachmentService::class]
+			)
+			->willReturnOnConsecutiveCalls(
+				$fileServiceMock,
+				$fileAppServiceMock,
+				new MyAttachmentService()
+			);
+
 		$application->expects($this->any())
 			->method('getContainer')
 			->willReturn($appContainer);
+
 		$attachmentService = new AttachmentService($this->attachmentMapper, $this->cardMapper, $this->changeHelper, $this->permissionService, $application, $this->cacheFactory, $this->userId, $this->l10n, $this->activityManager);
 		$attachmentService->registerAttachmentService('custom', MyAttachmentService::class);
 		$attachmentService->getService('deck_file_invalid');
@@ -185,12 +214,17 @@ class AttachmentServiceTest extends TestCase {
 			->with(123)
 			->willReturn($attachments);

-		$this->attachmentServiceImpl->expects($this->at(0))
+		$this->attachmentServiceImpl->expects($this->exactly(2))
 			->method('extendData')
-			->with($attachments[0]);
-		$this->attachmentServiceImpl->expects($this->at(1))
-			->method('extendData')
-			->with($attachments[1]);
+			->withConsecutive(
+				[$attachments[0]],
+				[$attachments[1]]
+			)
+			->willReturnOnConsecutiveCalls(
+				$attachments[0],
+				$attachments[1]
+			);
+
 		$this->assertEquals($attachments, $this->attachmentService->findAll(123, false));
 	}

@@ -215,12 +249,15 @@ class AttachmentServiceTest extends TestCase {
 			->with(123, false)
 			->willReturn($attachmentsDeleted);

-		$this->attachmentServiceImpl->expects($this->at(0))
+		$this->attachmentServiceImpl->expects($this->exactly(4))
 			->method('extendData')
-			->with($attachments[0]);
-		$this->attachmentServiceImpl->expects($this->at(1))
-			->method('extendData')
-			->with($attachments[1]);
+			->withConsecutive(
+				[$attachments[0]],
+				[$attachments[1]],
+				[$attachmentsDeleted[0]],
+				[$attachmentsDeleted[1]]
+			);
+
 		$this->assertEquals(array_merge($attachments, $attachmentsDeleted), $this->attachmentService->findAll(123, true));
 	}

@@ -396,5 +433,6 @@ class AttachmentServiceTest extends TestCase {
 			->method('allowUndo')
 			->willReturn(false);
 		$actual = $this->attachmentService->restore(1, 1);
+		$this->assertEquals($expected, $actual);
 	}
 }
--- a/tests/unit/Service/BoardServiceTest.php
+++ b/tests/unit/Service/BoardServiceTest.php
@@ -31,6 +31,7 @@ use OCA\Deck\Db\Assignment;
 use OCA\Deck\Db\AssignmentMapper;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\ChangeHelper;
 use OCA\Deck\Db\LabelMapper;
 use OCA\Deck\Db\StackMapper;
@@ -58,6 +59,8 @@ class BoardServiceTest extends TestCase {
 	private $boardMapper;
 	/** @var StackMapper */
 	private $stackMapper;
+	/** @var CardMapper */
+	private $cardMapper;
 	/** @var PermissionService */
 	private $permissionService;
 	/** @var NotificationHelper */
@@ -85,6 +88,7 @@ class BoardServiceTest extends TestCase {
 		$this->boardMapper = $this->createMock(BoardMapper::class);
 		$this->stackMapper = $this->createMock(StackMapper::class);
 		$this->config = $this->createMock(IConfig::class);
+		$this->cardMapper = $this->createMock(CardMapper::class);
 		$this->labelMapper = $this->createMock(LabelMapper::class);
 		$this->permissionService = $this->createMock(PermissionService::class);
 		$this->notificationHelper = $this->createMock(NotificationHelper::class);
@@ -106,6 +110,7 @@ class BoardServiceTest extends TestCase {
 			$this->permissionService,
 			$this->notificationHelper,
 			$this->assignedUsersMapper,
+			$this->cardMapper,
 			$this->userManager,
 			$this->groupManager,
 			$this->activityManager,
@@ -149,7 +154,7 @@ class BoardServiceTest extends TestCase {
 			->method('find')
 			->with(1)
 			->willReturn($b1);
-		$this->permissionService->expects($this->once())
+		$this->permissionService->expects($this->any())
 			->method('findUsers')
 			->willReturn([
 				'admin' => 'admin',
@@ -253,6 +258,14 @@ class BoardServiceTest extends TestCase {
 			->method('insert')
 			->with($acl)
 			->willReturn($acl);
+		$this->permissionService->expects($this->any())
+			->method('findUsers')
+			->willReturn([
+				'admin' => 'admin',
+			]);
+		$this->boardMapper->expects($this->once())
+			->method('find')
+			->willReturn(new Board());
 		$this->assertEquals($acl, $this->service->addAcl(
 			123, 'user', 'admin', true, true, true
 		));
@@ -295,30 +308,39 @@ class BoardServiceTest extends TestCase {
 		$existingAcl->setPermissionEdit($currentUserAcl[0]);
 		$existingAcl->setPermissionShare($currentUserAcl[1]);
 		$existingAcl->setPermissionManage($currentUserAcl[2]);
-		$this->permissionService->expects($this->at(0))
-			->method('checkPermission')
-			->with($this->boardMapper, 123, Acl::PERMISSION_SHARE, null);
+
 		if ($currentUserAcl[2]) {
-			$this->permissionService->expects($this->at(1))
+			$this->permissionService->expects($this->exactly(2))
 				->method('checkPermission')
-				->with($this->boardMapper, 123, Acl::PERMISSION_MANAGE, null);
+				->withConsecutive(
+					[$this->boardMapper, 123, Acl::PERMISSION_SHARE, null],
+					[$this->boardMapper, 123, Acl::PERMISSION_MANAGE, null]
+				);
 		} else {
 			$this->aclMapper->expects($this->once())
 				->method('findAll')
 				->willReturn([$existingAcl]);
-			$this->permissionService->expects($this->at(1))
+
+			$this->permissionService->expects($this->exactly(2))
 				->method('checkPermission')
-				->with($this->boardMapper, 123, Acl::PERMISSION_MANAGE, null)
-				->willThrowException(new NoPermissionException('No permission'));
-			$this->permissionService->expects($this->at(2))
+				->withConsecutive(
+					[$this->boardMapper, 123, Acl::PERMISSION_SHARE, null],
+					[$this->boardMapper, 123, Acl::PERMISSION_MANAGE, null]
+				)
+				->will(
+					$this->onConsecutiveCalls(
+						true,
+						$this->throwException(new NoPermissionException('No permission'))
+					)
+				);
+
+			$this->permissionService->expects($this->exactly(3))
 				->method('userCan')
-				->willReturn($currentUserAcl[0]);
-			$this->permissionService->expects($this->at(3))
-				->method('userCan')
-				->willReturn($currentUserAcl[1]);
-			$this->permissionService->expects($this->at(4))
-				->method('userCan')
-				->willReturn($currentUserAcl[2]);
+				->willReturnOnConsecutiveCalls(
+					$currentUserAcl[0],
+					$currentUserAcl[1],
+					$currentUserAcl[2]
+				);
 		}

 		$user = $this->createMock(IUser::class);
@@ -333,6 +355,14 @@ class BoardServiceTest extends TestCase {
 		$acl->resolveRelation('participant', function ($participant) use (&$user) {
 			return null;
 		});
+		$this->boardMapper->expects($this->once())
+			->method('find')
+			->willReturn(new Board());
+		$this->permissionService->expects($this->any())
+			->method('findUsers')
+			->willReturn([
+				'admin' => 'admin',
+			]);
 		$this->notificationHelper->expects($this->once())
 			->method('sendBoardShared');
 		$expected = clone $acl;
--- a/tests/unit/Service/PermissionServiceTest.php
+++ b/tests/unit/Service/PermissionServiceTest.php
@@ -139,13 +139,17 @@ class PermissionServiceTest extends \Test\TestCase {
 	}

 	public function testUserIsBoardOwner() {
-		$board = new Board();
-		$board->setOwner('admin');
-		$this->boardMapper->expects($this->at(0))->method('find')->with(123)->willReturn($board);
+		$adminBoard = new Board();
+		$adminBoard->setOwner('admin');
+		$userBoard = new Board();
+		$userBoard->setOwner('user1');
+
+		$this->boardMapper->expects($this->exactly(2))
+			->method('find')
+			->withConsecutive([123], [234])
+			->willReturnOnConsecutiveCalls($adminBoard, $userBoard);
+
 		$this->assertEquals(true, $this->service->userIsBoardOwner(123));
-		$board = new Board();
-		$board->setOwner('user1');
-		$this->boardMapper->expects($this->at(0))->method('find')->with(234)->willReturn($board);
 		$this->assertEquals(false, $this->service->userIsBoardOwner(234));
 	}

@@ -336,7 +340,7 @@ class PermissionServiceTest extends \Test\TestCase {
 		$aclGroup->setParticipant('group1');

 		$board = $this->createMock(Board::class);
-		$board->expects($this->at(0))
+		$board->expects($this->once())
 			->method('__call')
 			->with('getOwner', [])
 			->willReturn('user1');
@@ -348,14 +352,11 @@ class PermissionServiceTest extends \Test\TestCase {
 			->method('find')
 			->with(123)
 			->willReturn($board);
-		$this->userManager->expects($this->at(0))
+		$this->userManager->expects($this->exactly(2))
 			->method('get')
-			->with('user1')
-			->willReturn($user1);
-		$this->userManager->expects($this->at(1))
-			->method('get')
-			->with('user2')
-			->willReturn($user2);
+			->withConsecutive(['user1'], ['user2'])
+			->willReturnOnConsecutiveCalls($user1, $user2);
+
 		$group = $this->createMock(IGroup::class);
 		$group->expects($this->once())
 			->method('getUsers')