Support primary instead of icon

2 files changed, 11 insertions, 9 deletions

diff --git a/tests/controller/EndpointControllerTest.php b/tests/controller/EndpointControllerTest.php
index b85e401..ae4e063 100644
--- a/tests/controller/EndpointControllerTest.php
+++ b/tests/controller/EndpointControllerTest.php
@@ -483,8 +483,8 @@ class EndpointControllerTest extends TestCase {
 
 	public function dataActionToArray() {
 		return [
-			['label1', 'link1', 'GET'],
-			['label2', 'link2', 'POST'],
+			['label1', 'link1', 'GET', false],
+			['label2', 'link2', 'POST', true],
 		];
 	}
 
@@ -494,8 +494,9 @@ class EndpointControllerTest extends TestCase {
 	 * @param string $label
 	 * @param string $link
 	 * @param string $requestType
+	 * @param bool $isPrimary
 	 */
-	public function testActionToArray($label, $link, $requestType) {
+	public function testActionToArray($label, $link, $requestType, $isPrimary) {
 		$action = $this->getMockBuilder('OC\Notification\IAction')
 			->disableOriginalConstructor()
 			->getMock();
@@ -512,10 +513,15 @@ class EndpointControllerTest extends TestCase {
 			->method('getRequestType')
 			->willReturn($requestType);
 
+		$action->expects($this->once())
+			->method('isPrimary')
+			->willReturn($isPrimary);
+
 		$this->assertEquals([
 				'label' => $label,
 				'link' => $link,
 				'type' => $requestType,
+				'primary' => $isPrimary,
 			],
 			$this->invokePrivate($this->getController(), 'actionToArray', [$action])
 		);
diff --git a/tests/lib/HandlerTest.php b/tests/lib/HandlerTest.php
index fe472ea..9cd219d 100644
--- a/tests/lib/HandlerTest.php
+++ b/tests/lib/HandlerTest.php
@@ -54,13 +54,12 @@ class HandlerTest extends TestCase {
 			'getMessage' => 'message',
 			'getMessageParameters' => [],
 			'getLink' => 'link',
-			'getIcon' => 'icon',
 			'getActions' => [
 				[
 					'getLabel' => 'action_label',
-					'getIcon' => 'action_icon',
 					'getLink' => 'action_link',
 					'getRequestType' => 'GET',
+					'isPrimary' => false,
 				]
 			],
 		]);
@@ -110,13 +109,12 @@ class HandlerTest extends TestCase {
 			'getMessage' => 'message',
 			'getMessageParameters' => [],
 			'getLink' => 'link',
-			'getIcon' => 'icon',
 			'getActions' => [
 				[
 					'getLabel' => 'action_label',
-					'getIcon' => 'action_icon',
 					'getLink' => 'action_link',
 					'getRequestType' => 'GET',
+					'isPrimary' => true,
 				]
 			],
 		]);
@@ -201,7 +199,6 @@ class HandlerTest extends TestCase {
 			'getMessage' => '',
 			'getMessageParameters' => [],
 			'getLink' => '',
-			'getIcon' => '',
 			'getActions' => [],
 		];
 		foreach ($defaultValues as $method => $returnValue) {
@@ -222,7 +219,6 @@ class HandlerTest extends TestCase {
 			'setSubject',
 			'setMessage',
 			'setLink',
-			'setIcon',
 			'addAction',
 		];
 		foreach ($defaultValues as $method) {