diff --git a/3rdparty b/3rdparty index aea1df9dcc0ae..2761b6ad39428 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit aea1df9dcc0ae1b774e15edf07a470198b952e45 +Subproject commit 2761b6ad394282974929d1892487e19974cabdf9 diff --git a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php index b2e0a6568364a..c7446dd5e7d04 100644 --- a/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php @@ -28,9 +28,11 @@ use OCA\Files_External\Controller\GlobalStoragesController; use OCA\Files_External\Service\BackendService; +use OCP\IGroupManager; use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; +use OCP\IUserSession; class GlobalStoragesControllerTest extends StoragesControllerTest { protected function setUp(): void { @@ -47,7 +49,9 @@ protected function setUp(): void { $this->createMock(IRequest::class), $this->createMock(IL10N::class), $this->service, - $this->createMock(ILogger::class) + $this->createMock(ILogger::class), + $this->userSession, + $this->createMock(IGroupManager::class) ); } } diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php index fffac01507aa2..26a0eeac8f458 100644 --- a/apps/files_external/tests/Controller/StoragesControllerTest.php +++ b/apps/files_external/tests/Controller/StoragesControllerTest.php @@ -31,11 +31,12 @@ use OCA\Files_External\Controller\GlobalStoragesController; use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Backend\Backend; - use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\NotFoundException; use OCA\Files_External\Service\GlobalStoragesService; use OCP\AppFramework\Http; +use OCP\IUser; +use OCP\IUserSession; abstract class StoragesControllerTest extends \Test\TestCase { @@ -49,7 +50,16 @@ abstract class StoragesControllerTest extends \Test\TestCase { */ protected $service; + /** @var IUserSession */ + protected $userSession; + protected function setUp(): void { + $user = $this->createMock(IUser::class); + $user->method('getUID') + ->willReturn('test'); + $this->userSession = $this->createMock(IUserSession::class); + $this->userSession->method('getUser') + ->willReturn($user); \OCA\Files_External\MountConfig::$skipTest = true; } @@ -337,8 +347,11 @@ public function testGetStorage() { ->willReturn($storageConfig); $response = $this->controller->show(1); + $expected = $storageConfig->jsonSerialize(); + $expected['can_edit'] = false; + $this->assertEquals(Http::STATUS_OK, $response->getStatus()); - $this->assertEquals($storageConfig, $response->getData()); + $this->assertEquals($expected, $response->getData()); } public function validateStorageProvider() { diff --git a/apps/files_external/tests/Controller/UserStoragesControllerTest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php index ed2d46b614993..1ddff66c63a8a 100644 --- a/apps/files_external/tests/Controller/UserStoragesControllerTest.php +++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php @@ -31,6 +31,7 @@ use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Service\BackendService; use OCP\AppFramework\Http; +use OCP\IGroupManager; use OCP\IL10N; use OCP\ILogger; use OCP\IRequest; @@ -57,8 +58,9 @@ protected function setUp(): void { $this->createMock(IRequest::class), $this->createMock(IL10N::class), $this->service, - $this->createMock(IUserSession::class), - $this->createMock(ILogger::class) + $this->createMock(ILogger::class), + $this->userSession, + $this->createMock(IGroupManager::class) ); }