mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #921 from nextcloud/backport-867-notification-primary-action-always-first 

[stable10] Make sure the primary action is always the first one
This commit is contained in:
Roeland Jago Douma 2016-08-18 10:39:27 +02:00 committed by GitHub
parent 1927c28b9f e1ec3964c8
commit 5b6b9ad1ff
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Notification/Notification.php
View File

@ -397,9 +397,13 @@ class Notification implements INotification {
}
$this->hasPrimaryParsedAction = true;
// Make sure the primary action is always the first one
array_unshift($this->actionsParsed, $action);
} else {
$this->actionsParsed[] = $action;
}
$this->actionsParsed[] = $action;
return $this;
}

29
tests/lib/Notification/NotificationTest.php
View File

@ -495,6 +495,35 @@ class NotificationTest extends TestCase {
$this->notification->addParsedAction($action);
}
public function testAddActionParsedPrimaryEnd() {
/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
$action1 = $this->getMockBuilder('OCP\Notification\IAction')
->disableOriginalConstructor()
->getMock();
$action1->expects($this->exactly(2))
->method('isValidParsed')
->willReturn(true);
$action1->expects($this->exactly(2))
->method('isPrimary')
->willReturn(false);
/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
$action2 = $this->getMockBuilder('OCP\Notification\IAction')
->disableOriginalConstructor()
->getMock();
$action2->expects($this->once())
->method('isValidParsed')
->willReturn(true);
$action2->expects($this->once())
->method('isPrimary')
->willReturn(true);
$this->assertSame($this->notification, $this->notification->addParsedAction($action1));
$this->assertSame($this->notification, $this->notification->addParsedAction($action2));
$this->assertSame($this->notification, $this->notification->addParsedAction($action1));
$this->assertEquals([$action2, $action1, $action1], $this->notification->getParsedActions());
}
public function dataIsValid() {
return [
[false, '', false],