From ff2d96a1fb35d226d4bf83edb9b81f15d648f8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 10 Oct 2017 19:23:01 +0200 Subject: [PATCH] Fix tests that invoke findUsers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Service/BoardService.php | 3 ++- tests/unit/Db/CardTest.php | 1 + tests/unit/Service/BoardServiceTest.php | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index d46f6e01d..0f3482fee 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -103,7 +103,8 @@ class BoardService { 'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE], 'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE] ]); - $board->setUsers(array_values($this->permissionService->findUsers($boardId))); + $boardUsers = $this->permissionService->findUsers($boardId); + $board->setUsers(array_values($boardUsers)); return $board; } diff --git a/tests/unit/Db/CardTest.php b/tests/unit/Db/CardTest.php index 02867167c..d9de6427f 100644 --- a/tests/unit/Db/CardTest.php +++ b/tests/unit/Db/CardTest.php @@ -97,6 +97,7 @@ class CardTest extends \PHPUnit_Framework_TestCase { 'duedate' => null, 'overdue' => 0, 'archived' => false, + 'assignedUsers' => null, ], $card->jsonSerialize()); } diff --git a/tests/unit/Service/BoardServiceTest.php b/tests/unit/Service/BoardServiceTest.php index 77ab541e3..ba0221742 100644 --- a/tests/unit/Service/BoardServiceTest.php +++ b/tests/unit/Service/BoardServiceTest.php @@ -105,6 +105,11 @@ class BoardServiceTest extends TestCase { ->method('find') ->with(1) ->willReturn($b1); + $this->permissionService->expects($this->once()) + ->method('findUsers') + ->willReturn([ + 'admin' => 'admin', + ]); $this->assertEquals($b1, $this->service->find(1)); } @@ -137,6 +142,11 @@ class BoardServiceTest extends TestCase { ->method('update') ->with($board) ->willReturn($board); + $this->permissionService->expects($this->once()) + ->method('findUsers') + ->willReturn([ + 'admin' => 'admin', + ]); $b = $this->service->update(123, 'MyNewNameBoard', 'ffffff', false); $this->assertEquals($b->getTitle(), 'MyNewNameBoard'); @@ -151,6 +161,11 @@ class BoardServiceTest extends TestCase { $this->boardMapper->expects($this->once()) ->method('find') ->willReturn($board); + $this->permissionService->expects($this->once()) + ->method('findUsers') + ->willReturn([ + 'admin' => 'admin', + ]); $this->assertEquals($board, $this->service->delete(123)); }