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

Tests: More coverage for DeckProvider->parse()

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-09-06 15:05:35 +02:00
parent 0cc4fffd08
commit 80aadb2717
3 changed files with 161 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Activity/ActivityManager.php
View File

@@ -348,6 +348,7 @@ class ActivityManager {
}
if ($subject === self::SUBJECT_CARD_UPDATE_DESCRIPTION){
// TODO: Use ChangeSet and getDiff method
$message = $additionalParams['after'];
}

11
lib/Activity/DeckProvider.php
View File

@@ -28,6 +28,7 @@ use cogpowered\FineDiff\Diff;
use OCP\Activity\IEvent;
use OCP\Activity\IProvider;
use OCP\IURLGenerator;
use OCP\IUserManager;
class DeckProvider implements IProvider {
@@ -37,11 +38,14 @@ class DeckProvider implements IProvider {
private $urlGenerator;
/** @var ActivityManager */
private $activityManager;
/** @var IUserManager */
private $userManager;
public function __construct(IURLGenerator $urlGenerator, ActivityManager $activityManager, $userId) {
public function __construct(IURLGenerator $urlGenerator, ActivityManager $activityManager, IUserManager $userManager, $userId) {
$this->userId = $userId;
$this->urlGenerator = $urlGenerator;
$this->activityManager = $activityManager;
$this->userManager = $userManager;
}
@@ -104,15 +108,14 @@ class DeckProvider implements IProvider {
'name' => $event->getObjectName(),
];
if ($subjectParams['board']) {
if (array_key_exists('board', $subjectParams)) {
$archivedParam = $subjectParams['card']['archived'] ? 'archived' : '';
$card['link'] = $this->deckUrl('/board/' . $subjectParams['board']['id'] . '/' . $archivedParam . '/card/' . $event->getObjectId());
}
}
$userManager = \OC::$server->getUserManager();
$author = $event->getAuthor();
$user = $userManager->get($author);
$user = $this->userManager->get($author);
$params = [
'board' => $board,
'card' => $card,

154
tests/unit/Activity/DeckProviderTest.php
View File

@@ -23,9 +23,13 @@
namespace OCA\Deck\Activity;
use OC\Activity\Event;
use OCP\Activity\IEvent;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
use OCP\RichObjectStrings\IValidator;
use PHPUnit\Framework\TestCase;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -40,6 +44,9 @@ class DeckProviderTest extends TestCase {
/** @var ActivityManager|MockObject */
private $activityManager;
/** @var IUserManager|MockObject */
private $userManager;
/** @var string */
private $userId = 'admin';
@@ -47,7 +54,8 @@ class DeckProviderTest extends TestCase {
$this->l10n = $this->createMock(IL10N::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->activityManager = $this->createMock(ActivityManager::class);
$this->provider = new DeckProvider($this->urlGenerator, $this->activityManager, $this->userId);
$this->userManager = $this->createMock(IUserManager::class);
$this->provider = new DeckProvider($this->urlGenerator, $this->activityManager, $this->userManager, $this->userId);
}
private function mockEvent($objectType, $objectId, $objectName, $subject, $subjectParameters = []) {
@@ -84,7 +92,12 @@ class DeckProviderTest extends TestCase {
public function dataEventIcons() {
return [
[ActivityManager::SUBJECT_CARD_MOVE_STACK, 'deck', 'deck-dark.svg'],
[ActivityManager::SUBJECT_CARD_CREATE, 'files', 'add-color.svg'],
[ActivityManager::SUBJECT_CARD_UPDATE, 'files', 'change.svg'],
[ActivityManager::SUBJECT_CARD_DELETE, 'files', 'delete-color.svg'],
[ActivityManager::SUBJECT_CARD_UPDATE_ARCHIVE, 'deck', 'archive.svg'],
[ActivityManager::SUBJECT_CARD_RESTORE, 'core', 'actions/history.svg'],
[ActivityManager::SUBJECT_ATTACHMENT_UPDATE, 'core', 'places/files.svg'],
];
}
/**
@@ -116,4 +129,143 @@ class DeckProviderTest extends TestCase {
);
}
public function testParseObjectTypeBoard() {
$this->urlGenerator->expects($this->any())
->method('imagePath')
->will($this->returnCallback(function($a, $i) {
return $a . '/' . $i;
}));
$this->activityManager->expects($this->once())
->method('getActivityFormat')
->willReturn('test string {board}');
$user = $this->createMock(IUser::class);
$user->expects($this->any())->method('getDisplayName')->willReturn('Administrator');
$this->userManager->expects($this->any())
->method('get')
->willReturn($user);
$richValidator = $this->createMock(IValidator::class);
$event = new Event($richValidator);
$event->setApp('deck');
$event->setSubject(ActivityManager::SUBJECT_BOARD_CREATE);
$event->setAffectedUser($this->userId);
$event->setAuthor($this->userId);
$event->setObject(ActivityManager::DECK_OBJECT_BOARD, 1, 'Board');
$this->provider->parse('en_US', $event);
$data = [
'board' => [
'type' => 'highlight',
'id' => 1,
'name' => 'Board',
'link' => '#!/board/1',
],
'card' => null,
'user' => [
'type' => 'user',
'id' => 'admin',
'name' => 'Administrator',
]
];
$this->assertEquals($data, $event->getRichSubjectParameters());
}
public function testParseObjectTypeCard() {
$this->urlGenerator->expects($this->any())
->method('imagePath')
->will($this->returnCallback(function($a, $i) {
return $a . '/' . $i;
}));
$this->activityManager->expects($this->once())
->method('getActivityFormat')
->willReturn('test string {board}');
$user = $this->createMock(IUser::class);
$user->expects($this->any())->method('getDisplayName')->willReturn('Administrator');
$this->userManager->expects($this->any())
->method('get')
->willReturn($user);
$richValidator = $this->createMock(IValidator::class);
$event = new Event($richValidator);
$event->setApp('deck');
$event->setSubject(ActivityManager::SUBJECT_CARD_CREATE);
$event->setAffectedUser($this->userId);
$event->setAuthor($this->userId);
$event->setObject(ActivityManager::DECK_OBJECT_CARD, 1, 'Card');
$this->provider->parse('en_US', $event);
$data = [
'board' => null,
'card' => [
'type' => 'highlight',
'id' => 1,
'name' => 'Card',
],
'user' => [
'type' => 'user',
'id' => 'admin',
'name' => 'Administrator',
]
];
$this->assertEquals($data, $event->getRichSubjectParameters());
$this->assertEquals('test string {board}', $event->getParsedSubject());
$this->assertEquals('test string {board}', $event->getRichSubject());
$this->assertEquals('', $event->getMessage());
}
public function testParseObjectTypeCardWithDiff() {
$this->urlGenerator->expects($this->any())
->method('imagePath')
->will($this->returnCallback(function($a, $i) {
return $a . '/' . $i;
}));
$this->activityManager->expects($this->once())
->method('getActivityFormat')
->willReturn('test string {board}');
$user = $this->createMock(IUser::class);
$user->expects($this->any())->method('getDisplayName')->willReturn('Administrator');
$this->userManager->expects($this->any())
->method('get')
->willReturn($user);
$richValidator = $this->createMock(IValidator::class);
$event = new Event($richValidator);
$event->setApp('deck');
$event->setSubject(ActivityManager::SUBJECT_CARD_UPDATE_DESCRIPTION, [
'before' => 'ABC',
'after' => 'BCD'
]);
$event->setAffectedUser($this->userId);
$event->setAuthor($this->userId);
$event->setObject(ActivityManager::DECK_OBJECT_CARD, 1, 'Card');
$event->setMessage('BCD');
$this->provider->parse('en_US', $event);
$data = [
'board' => null,
'card' => [
'type' => 'highlight',
'id' => 1,
'name' => 'Card',
],
'user' => [
'type' => 'user',
'id' => 'admin',
'name' => 'Administrator',
],
'before' => ['type' => 'highlight', 'id' => 'ABC', 'name' => 'ABC'],
'after' => ['type' => 'highlight', 'id' => 'BCD', 'name' => 'BCD']
];
$this->assertEquals($data, $event->getRichSubjectParameters());
$this->assertEquals('test string {board}', $event->getParsedSubject());
$this->assertEquals('test string {board}', $event->getRichSubject());
$this->assertEquals('BCD', $event->getMessage());
$this->assertEquals('<pre class="visualdiff"><del>A</del>BC<ins>D</ins></pre>', $event->getParsedMessage());
}
}