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

Fix tests after reordering has changed

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2019-09-10 16:30:01 +02:00
parent f74a3d6724
commit 6eb8c117a3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Service/CardService.php
View File

@@ -402,6 +402,9 @@ class CardService {
} }
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
if ($card->getArchived()) {
throw new StatusException('Operation not allowed. This card is archived.');
}
$card->setStackId($stackId); $card->setStackId($stackId);
$this->cardMapper->update($card); $this->cardMapper->update($card);

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

@@ -231,7 +231,10 @@ class CardServiceTest extends TestCase {
public function testReorder($cardId, $newPosition, $order) { public function testReorder($cardId, $newPosition, $order) {
$cards = $this->getCards(); $cards = $this->getCards();
$cardsTmp = []; $cardsTmp = [];
$this->cardMapper->expects($this->at(0))->method('findAll')->willReturn($cards); $this->cardMapper->expects($this->once())->method('findAll')->willReturn($cards);
$card = new Card();
$card->setStackId(123);
$this->cardMapper->expects($this->once())->method('find')->willReturn($card);
$result = $this->cardService->reorder($cardId, 123, $newPosition); $result = $this->cardService->reorder($cardId, 123, $newPosition);
foreach ($result as $card) { foreach ($result as $card) {
$actual[$card->getOrder()] = $card->getId(); $actual[$card->getOrder()] = $card->getId();
@@ -254,7 +257,8 @@ class CardServiceTest extends TestCase {
$card = new Card(); $card = new Card();
$card->setTitle('title'); $card->setTitle('title');
$card->setArchived(true); $card->setArchived(true);
$this->cardMapper->expects($this->once())->method('findAll')->willReturn([$card]); $card->setStackId(123);
$this->cardMapper->expects($this->once())->method('find')->willReturn($card);
$this->cardMapper->expects($this->never())->method('update')->willReturnCallback(function($c) { return $c; }); $this->cardMapper->expects($this->never())->method('update')->willReturnCallback(function($c) { return $c; });
$this->expectException(StatusException::class); $this->expectException(StatusException::class);
$actual = $this->cardService->reorder(123, 234, 1); $actual = $this->cardService->reorder(123, 234, 1);