ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Fix tests

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2023-02-16 18:51:43 +01:00
parent b19b7794bc
commit 46df19a3a6
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DAV/DeckCalendarBackend.php
View File

@@ -59,7 +59,7 @@ class DeckCalendarBackend {
}
public function getBoards(): array {
return $this->boardService->findAll(-1, null, false);
return $this->boardService->findAll(-1, false, false);
}
public function getBoard(int $id): Board {

5
lib/Service/BoardService.php
View File

@@ -160,7 +160,7 @@ class BoardService {
}
$complete = $this->getUserBoards($since, $includeArchived);
return $this->enrichBoards($complete, $fullDetails !== null);
return $this->enrichBoards($complete, $fullDetails);
}
/**
@@ -675,7 +675,6 @@ class BoardService {
} else {
$this->boardsCachePartial[$board->getId()] = $board;
}
}
return $boards;
@@ -703,7 +702,7 @@ class BoardService {
private function enrichWithUsers($board, $since = -1) {
$boardUsers = $this->permissionService->findUsers($board->getId());
if (\count($boardUsers) === 0) {
if ($boardUsers === null || \count($boardUsers) === 0) {
return;
}
$board->setUsers(array_values($boardUsers));

2
lib/Service/CardService.php
View File

@@ -175,7 +175,7 @@ class CardService {
public function find(int $cardId) {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
$card = $this->cardMapper->find($cardId);
$this->enrichCards([$card]);
[$card] = $this->enrichCards([$card]);
// Attachments are only enriched on individual card fetching
$attachments = $this->attachmentService->findAll($cardId, true);

3
tests/unit/Service/CardServiceTest.php
View File

@@ -156,7 +156,8 @@ class CardServiceTest extends TestCase {
->method('getNumberOfCommentsForObject')
->willReturn(0);
$boardMock = $this->createMock(Board::class);
$stackMock = $this->createMock(Stack::class);
$stackMock = new Stack();
$stackMock->setBoardId(1234);
$this->stackMapper->expects($this->any())
->method('find')
->willReturn($stackMock);

6
tests/unit/controller/BoardControllerTest.php
View File

@@ -24,6 +24,7 @@
namespace OCA\Deck\Controller;
use OCA\Deck\Db\Acl;
use OCA\Deck\Db\Board;
use OCP\IUser;
class BoardControllerTest extends \Test\TestCase {
@@ -88,11 +89,12 @@ class BoardControllerTest extends \Test\TestCase {
}
public function testRead() {
$board = new Board();
$this->boardService->expects($this->once())
->method('find')
->with(123)
->willReturn(1);
$this->assertEquals(1, $this->controller->read(123));
->willReturn($board);
$this->assertEquals($board, $this->controller->read(123));
}
public function testCreate() {