upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Fixed tests

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-03-23 18:24:03 +01:00
parent 4011ea97b1
commit b023bfe38f
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/provisioning_api/lib/Controller/GroupsController.php
View file

@ -29,6 +29,8 @@ namespace OCA\Provisioning_API\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\OCS\OCSForbiddenException;
use OCP\AppFramework\OCSController;
use OCP\IGroup;
use OCP\IGroupManager;
@ -106,7 +108,7 @@ class GroupsController extends OCSController {
* @param int $offset
* @return DataResponse
*/
public function getGroupsDetails(string $search = '', int $limit = null, int $offset = null): DataResponse {
public function getGroupsDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
$groups = $this->groupManager->search($search, $limit, $offset);
$groups = array_map(function($group) {
/** @var IGroup $group */
@ -126,7 +128,7 @@ class GroupsController extends OCSController {
* @deprecated 14 Use getGroupUsers
*/
public function getGroup(string $groupId): DataResponse {
return $this->getGroup($groupId);
return $this->getGroupUsers($groupId);
}
/**
@ -147,7 +149,7 @@ class GroupsController extends OCSController {
if ($group !== null) {
$isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
} else {
throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND);
throw new OCSNotFoundException('The requested group could not be found');
}
// Check subadmin has access to this group
@ -162,7 +164,7 @@ class GroupsController extends OCSController {
return new DataResponse(['users' => $users]);
}
throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED);
throw new OCSForbiddenException();
}
/**

21
apps/provisioning_api/tests/Controller/GroupsControllerTest.php
View file

@ -40,6 +40,8 @@ class GroupsControllerTest extends \Test\TestCase {
protected $userSession;
/** @var \OC\SubAdmin|\PHPUnit_Framework_MockObject_MockObject */
protected $subAdminManager;
/** @var OCA\Provisioning_API\Controller\UsersController|\PHPUnit_Framework_MockObject_MockObject */
protected $userController;
/** @var GroupsController */
protected $api;
@ -67,12 +69,17 @@ class GroupsControllerTest extends \Test\TestCase {
$logger = $this->createMock(ILogger::class);
$this->userController = $this->getMockBuilder('OCA\Provisioning_API\Controller\UsersController')
->disableOriginalConstructor()
->getMock();
$this->api = new GroupsController(
'provisioning_api',
$request,
$this->groupManager,
$this->userSession,
$logger
$logger,
$this->userController
);
}
@ -141,10 +148,10 @@ class GroupsControllerTest extends \Test\TestCase {
public function dataGetGroups() {
return [
[null, null, null],
['foo', null, null],
[null, 1, null],
[null, null, 2],
[null, 0, 0],
['foo', 0, 0],
[null, 1, 0],
[null, 0, 2],
['foo', 1, 2],
];
}
@ -224,7 +231,7 @@ class GroupsControllerTest extends \Test\TestCase {
/**
* @expectedException \OCP\AppFramework\OCS\OCSException
* @expectedExceptionCode 997
* @expectedExceptionCode 403
*/
public function testGetGroupAsIrrelevantSubadmin() {
$group = $this->createGroup('group');
@ -269,7 +276,7 @@ class GroupsControllerTest extends \Test\TestCase {
/**
* @expectedException \OCP\AppFramework\OCS\OCSException
* @expectedExceptionCode 998
* @expectedExceptionCode 404
* @expectedExceptionMessage The requested group could not be found
*/
public function testGetGroupNonExisting() {