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

Merge pull request #680 from nextcloud/bugfix/noid/activity-plain-subject

Browse Source 
Replace subject parameters in plain subject string as well
This commit is contained in:
Julius Härtl
2018-11-09 16:03:46 +01:00
committed by GitHub
parent a6da1ded25 2b74da9d30
commit 5371a02653
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Activity/DeckProvider.php
View File

@@ -127,13 +127,28 @@ class DeckProvider implements IProvider {
try { try {
$subject = $this->activityManager->getActivityFormat($subjectIdentifier, $subjectParams, $ownActivity); $subject = $this->activityManager->getActivityFormat($subjectIdentifier, $subjectParams, $ownActivity);
$event->setParsedSubject($subject); $this->setSubjects($event, $subject, $params);
$event->setRichSubject($subject, $params);
} catch (\Exception $e) { } catch (\Exception $e) {
} }
return $event; return $event;
} }
/**
* @param IEvent $event
* @param string $subject
* @param array $parameters
*/
protected function setSubjects(IEvent $event, $subject, array $parameters) {
$placeholders = $replacements = [];
foreach ($parameters as $placeholder => $parameter) {
$placeholders[] = '{' . $placeholder . '}';
$replacements[] = $parameter['name'];
}
$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
->setRichSubject($subject, $parameters);
}
private function getIcon(IEvent $event) { private function getIcon(IEvent $event) {
$event->setIcon($this->urlGenerator->imagePath('deck', 'deck-dark.svg')); $event->setIcon($this->urlGenerator->imagePath('deck', 'deck-dark.svg'));
if (strpos($event->getSubject(), '_update') !== false) { if (strpos($event->getSubject(), '_update') !== false) {

1
tests/unit/Activity/ActivityManagerTest.php
View File

@@ -116,6 +116,7 @@ class ActivityManagerTest extends TestCase {
public function testCreateEvent() { public function testCreateEvent() {
$board = new Board(); $board = new Board();
$board->setTitle('');
$this->boardMapper->expects($this->once()) $this->boardMapper->expects($this->once())
->method('find') ->method('find')
->willReturn($board); ->willReturn($board);

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

@@ -76,8 +76,17 @@ class DeckProviderTest extends TestCase {
$event->expects($this->any())->method('getObjectName')->willReturn($objectName); $event->expects($this->any())->method('getObjectName')->willReturn($objectName);
$event->expects($this->any())->method('getAuthor')->willReturn('admin'); $event->expects($this->any())->method('getAuthor')->willReturn('admin');
$event->expects($this->any())->method('getMessage')->willReturn(''); $event->expects($this->any())->method('getMessage')->willReturn('');
$event->expects($this->any())->method('setIcon')->will($this->returnCallback(function($icon) use (&$data) { $event->expects($this->any())->method('setIcon')->will($this->returnCallback(function($icon) use (&$data, $event) {
$data['icon'] = $icon; $data['icon'] = $icon;
return $event;
}));
$event->expects($this->any())->method('setParsedSubject')->will($this->returnCallback(function($subject) use (&$data, $event) {
$data['parsedSubject'] = $subject;
return $event;
}));
$event->expects($this->any())->method('setRichSubject')->will($this->returnCallback(function($subject) use (&$data, $event) {
$data['richSubject'] = $subject;
return $event;
})); }));
$event->expects($this->any())->method('getIcon')->will( $event->expects($this->any())->method('getIcon')->will(
$this->returnCallback(function() use (&$data) { $this->returnCallback(function() use (&$data) {
@@ -116,6 +125,9 @@ class DeckProviderTest extends TestCase {
$event = $this->mockEvent( $event = $this->mockEvent(
ActivityManager::DECK_OBJECT_BOARD, 1, 'Board', ActivityManager::DECK_OBJECT_BOARD, 1, 'Board',
$subject); $subject);
$this->activityManager->expects($this->once())
->method('getActivityFormat')
->willReturn('test string {board}');
$this->urlGenerator->expects($this->any()) $this->urlGenerator->expects($this->any())
->method('imagePath') ->method('imagePath')
->will($this->returnCallback(function($a, $i) { ->will($this->returnCallback(function($a, $i) {
@@ -186,7 +198,7 @@ class DeckProviderTest extends TestCase {
})); }));
$this->activityManager->expects($this->once()) $this->activityManager->expects($this->once())
->method('getActivityFormat') ->method('getActivityFormat')
->willReturn('test string {board}'); ->willReturn('test string {card}');
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->expects($this->any())->method('getDisplayName')->willReturn('Administrator'); $user->expects($this->any())->method('getDisplayName')->willReturn('Administrator');
$this->userManager->expects($this->any()) $this->userManager->expects($this->any())
@@ -217,8 +229,8 @@ class DeckProviderTest extends TestCase {
] ]
]; ];
$this->assertEquals($data, $event->getRichSubjectParameters()); $this->assertEquals($data, $event->getRichSubjectParameters());
$this->assertEquals('test string {board}', $event->getParsedSubject()); $this->assertEquals('test string Card', $event->getParsedSubject());
$this->assertEquals('test string {board}', $event->getRichSubject()); $this->assertEquals('test string {card}', $event->getRichSubject());
$this->assertEquals('', $event->getMessage()); $this->assertEquals('', $event->getMessage());
} }
@@ -231,7 +243,7 @@ class DeckProviderTest extends TestCase {
})); }));
$this->activityManager->expects($this->once()) $this->activityManager->expects($this->once())
->method('getActivityFormat') ->method('getActivityFormat')
->willReturn('test string {board}'); ->willReturn('test string {card}');
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->expects($this->any())->method('getDisplayName')->willReturn('Administrator'); $user->expects($this->any())->method('getDisplayName')->willReturn('Administrator');
$this->userManager->expects($this->any()) $this->userManager->expects($this->any())
@@ -267,8 +279,8 @@ class DeckProviderTest extends TestCase {
], ],
]; ];
$this->assertEquals($data, $event->getRichSubjectParameters()); $this->assertEquals($data, $event->getRichSubjectParameters());
$this->assertEquals('test string {board}', $event->getParsedSubject()); $this->assertEquals('test string Card', $event->getParsedSubject());
$this->assertEquals('test string {board}', $event->getRichSubject()); $this->assertEquals('test string {card}', $event->getRichSubject());
$this->assertEquals('BCD', $event->getMessage()); $this->assertEquals('BCD', $event->getMessage());
$this->assertEquals('<pre class="visualdiff"><del>A</del>BC<ins>D</ins></pre>', $event->getParsedMessage()); $this->assertEquals('<pre class="visualdiff"><del>A</del>BC<ins>D</ins></pre>', $event->getParsedMessage());
} }