Fix unit test

Signed-off-by: Joas Schilling <[email protected]>

tests/Unit/AppInfo/AppTest.php

@@ -67,10 +67,8 @@ protected function tearDown() {
 	public function testRegisterApp() {
 		$this->manager->expects($this->once())
 			->method('registerApp')
-			->willReturnCallback(function($closure) {
-				$this->assertInstanceOf(\Closure::class, $closure);
-				$navigation = $closure();
-				$this->assertInstanceOf(App::class, $navigation);
+			->willReturnCallback(function($service) {
+				$this->assertSame(App::class, $service);
 			});
 
 		include(__DIR__ . '/../../../appinfo/app.php');

tests/Unit/CapabilitiesTest.php

@@ -38,10 +38,12 @@ public function testGetCapabilities() {
 					'delete-all',
 					'icons',
 					'rich-strings',
+					'action-web',
 				],
 				'push' => [
 					'devices',
 					'object-data',
+					'delete',
 				],
 				'admin-notifications' => [
 					'ocs',

tests/Unit/Controller/EndpointControllerTest.php

@@ -25,6 +25,7 @@
 use OCA\Notifications\Controller\EndpointController;
 use OCA\Notifications\Exceptions\NotificationNotFoundException;
 use OCA\Notifications\Handler;
+use OCA\Notifications\Push;
 use OCA\Notifications\Tests\Unit\TestCase;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -59,27 +60,19 @@ class EndpointControllerTest extends TestCase {
 
 	/** @var IUser|MockObject */
 	protected $user;
+	/** @var Push|MockObject */
+	protected $push;
 
 	protected function setUp() {
 		parent::setUp();
 
-		/** @var IRequest|MockObject */
 		$this->request = $this->createMock(IRequest::class);
-
-		/** @var Handler|MockObject */
 		$this->handler = $this->createMock(Handler::class);
-
-		/** @var IManager|MockObject */
 		$this->manager = $this->createMock(IManager::class);
-
-		/** @var IConfig|MockObject */
 		$this->config = $this->createMock(IConfig::class);
-
-		/** @var IUserSession|MockObject */
 		$this->session = $this->createMock(IUserSession::class);
-
-		/** @var IUser|MockObject */
 		$this->user = $this->createMock(IUser::class);
+		$this->push = $this->createMock(Push::class);
 
 		$this->session->expects($this->any())
 			->method('getUser')
@@ -98,7 +91,8 @@ protected function getController(array $methods = [], $username = 'username') {
 				$this->handler,
 				$this->manager,
 				$this->config,
-				$this->session
+				$this->session,
+				$this->push
 			);
 		}
 
@@ -109,7 +103,8 @@ protected function getController(array $methods = [], $username = 'username') {
 				$this->handler,
 				$this->manager,
 				$this->config,
-				$this->session
+				$this->session,
+				$this->push,
 			])
 			->setMethods($methods)
 			->getMock();
@@ -163,7 +158,7 @@ public function testListNotifications($apiVersion, array $notifications, $expect
 			->getMock();
 		$filter->expects($this->once())
 			->method('setUser')
-			->willReturn('username');
+			->willReturn($filter);
 
 		$this->manager->expects($this->once())
 			->method('hasNotifiers')
@@ -175,6 +170,11 @@ public function testListNotifications($apiVersion, array $notifications, $expect
 			->method('prepare')
 			->willReturnArgument(0);
 
+		$this->config->expects($this->once())
+			->method('getUserValue')
+			->with('username', 'core', 'lang', null)
+			->willReturn('en');
+
 		$this->handler->expects($this->once())
 			->method('get')
 			->with($filter)
@@ -225,7 +225,7 @@ public function testListNotificationsThrows($apiVersion, array $notifications, $
 			->getMock();
 		$filter->expects($this->once())
 			->method('setUser')
-			->willReturn('username');
+			->willReturn($filter);
 
 		$this->manager->expects($this->once())
 			->method('hasNotifiers')
@@ -240,6 +240,11 @@ public function testListNotificationsThrows($apiVersion, array $notifications, $
 			->method('prepare')
 			->willReturnArgument(0);
 
+		$this->config->expects($this->once())
+			->method('getUserValue')
+			->with('username', 'core', 'lang', null)
+			->willReturn('en');
+
 		$this->handler->expects($this->once())
 			->method('get')
 			->with($filter)
@@ -316,6 +321,11 @@ public function testGetNotification($apiVersion, $id, $username) {
 			->with($id, $notification)
 			->willReturn(['$notification']);
 
+		$this->config->expects($this->once())
+			->method('getUserValue')
+			->with($username, 'core', 'lang', null)
+			->willReturn('en');
+
 		$response = $controller->getNotification($apiVersion, $id);
 		$this->assertInstanceOf(DataResponse::class, $response);
 		$this->assertSame(Http::STATUS_OK, $response->getStatus());
@@ -361,6 +371,11 @@ public function testGetNotificationNoId($apiVersion, $hasNotifiers, $id, $called
 				->method('getById')
 				->willReturn($notification);
 
+			$this->config->expects($this->once())
+				->method('getUserValue')
+				->with('username', 'core', 'lang', null)
+				->willReturn('en');
+
 			$this->manager->expects($this->once())
 				->method('prepare')
 				->willThrowException(new \InvalidArgumentException());