1 files changed, 35 insertions, 23 deletions

diff --git a/apps/files_external/tests/Controller/AjaxControllerTest.php b/apps/files_external/tests/Controller/AjaxControllerTest.php
index dc9661732cc..b1ea7a2b1b1 100644
--- a/apps/files_external/tests/Controller/AjaxControllerTest.php
+++ b/apps/files_external/tests/Controller/AjaxControllerTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,35 +12,29 @@ use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
 use OCA\Files_External\Lib\Auth\PublicKey\RSA;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IGroupManager;
+use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class AjaxControllerTest extends TestCase {
-	/** @var IRequest */
-	private $request;
-	/** @var RSA */
-	private $rsa;
-	/** @var GlobalAuth */
-	private $globalAuth;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var AjaxController */
-	private $ajaxController;
+	private IRequest&MockObject $request;
+	private RSA&MockObject $rsa;
+	private GlobalAuth&MockObject $globalAuth;
+	private IUserSession&MockObject $userSession;
+	private IGroupManager&MockObject $groupManager;
+	private IL10N&MockObject $l10n;
+	private AjaxController $ajaxController;
 
 	protected function setUp(): void {
 		$this->request = $this->createMock(IRequest::class);
-		$this->rsa = $this->getMockBuilder('\\OCA\\Files_External\\Lib\\Auth\\PublicKey\\RSA')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->globalAuth = $this->getMockBuilder('\\OCA\\Files_External\\Lib\\Auth\\Password\GlobalAuth')
-			->disableOriginalConstructor()
-			->getMock();
+		$this->rsa = $this->createMock(RSA::class);
+		$this->globalAuth = $this->createMock(GlobalAuth::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->groupManager = $this->createMock(IGroupManager::class);
+		$this->l10n = $this->createMock(IL10N::class);
 
 		$this->ajaxController = new AjaxController(
 			'files_external',
@@ -46,9 +42,19 @@ class AjaxControllerTest extends TestCase {
 			$this->rsa,
 			$this->globalAuth,
 			$this->userSession,
-			$this->groupManager
+			$this->groupManager,
+			$this->l10n,
 		);
 
+		$this->l10n->expects($this->any())
+			->method('t')
+			->willReturnCallback(function ($string, $args) {
+				if (!is_array($args)) {
+					$args = [$args];
+				}
+				return vsprintf($string, $args);
+			});
+
 		parent::setUp();
 	}
 
@@ -87,7 +93,9 @@ class AjaxControllerTest extends TestCase {
 			->expects($this->never())
 			->method('saveAuth');
 
-		$this->assertSame(false, $this->ajaxController->saveGlobalCredentials('UidOfTestUser', 'test', 'password'));
+		$response = $this->ajaxController->saveGlobalCredentials('UidOfTestUser', 'test', 'password');
+		$this->assertSame($response->getStatus(), 403);
+		$this->assertSame('Permission denied', $response->getData()['message']);
 	}
 
 	public function testSaveGlobalCredentialsAsAdminForSelf(): void {
@@ -105,7 +113,8 @@ class AjaxControllerTest extends TestCase {
 			->method('saveAuth')
 			->with('MyAdminUid', 'test', 'password');
 
-		$this->assertSame(true, $this->ajaxController->saveGlobalCredentials('MyAdminUid', 'test', 'password'));
+		$response = $this->ajaxController->saveGlobalCredentials('MyAdminUid', 'test', 'password');
+		$this->assertSame($response->getStatus(), 200);
 	}
 
 	public function testSaveGlobalCredentialsAsNormalUserForSelf(): void {
@@ -120,7 +129,8 @@ class AjaxControllerTest extends TestCase {
 			->method('saveAuth')
 			->with('MyUserUid', 'test', 'password');
 
-		$this->assertSame(true, $this->ajaxController->saveGlobalCredentials('MyUserUid', 'test', 'password'));
+		$response = $this->ajaxController->saveGlobalCredentials('MyUserUid', 'test', 'password');
+		$this->assertSame($response->getStatus(), 200);
 	}
 
 	public function testSaveGlobalCredentialsAsNormalUserForAnotherUser(): void {
@@ -135,6 +145,8 @@ class AjaxControllerTest extends TestCase {
 			->expects($this->never())
 			->method('saveAuth');
 
-		$this->assertSame(false, $this->ajaxController->saveGlobalCredentials('AnotherUserUid', 'test', 'password'));
+		$response = $this->ajaxController->saveGlobalCredentials('AnotherUserUid', 'test', 'password');
+		$this->assertSame($response->getStatus(), 403);
+		$this->assertSame('Permission denied', $response->getData()['message']);
 	}
 }