Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-29559: Delete sleeping requirement for non-empty roles #2525

Merged
merged 3 commits into from
Jan 17, 2019
Merged

EZP-29559: Delete sleeping requirement for non-empty roles #2525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c00b69e
EZP-29559: Uncomment sleeping code for role policy editing
glye Jan 15, 2019
3bb16b0
Revert "EZP-29559: Uncomment sleeping code for role policy editing"
glye Jan 17, 2019
fb49671
EZP-29559: Delete sleeping requirement for non-empty roles
glye Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 73 additions & 4 deletions eZ/Publish/API/Repository/Tests/RoleServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ public function testCreateRoleDraft()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);
$newRoleDraft = $roleService->createRoleDraft($role);
Expand Down Expand Up @@ -283,6 +287,10 @@ public function testCreateRoleDraftThrowsInvalidArgumentException()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);
$roleService->createRoleDraft($role); // First role draft
Expand Down Expand Up @@ -423,6 +431,10 @@ public function testLoadRole()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);

// Load the newly created role by its ID
Expand Down Expand Up @@ -474,6 +486,10 @@ public function testLoadRoleDraftByRoleId()
// $roleCreate->mainLanguageCode = 'eng-US';

$role = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$role,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($role);

// Now create a new draft based on the role
Expand Down Expand Up @@ -568,6 +584,10 @@ public function testLoadRoleByIdentifier()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);

// Load the newly created role by its identifier
Expand Down Expand Up @@ -619,6 +639,10 @@ public function testLoadRoles()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);

// Now load all available roles
Expand Down Expand Up @@ -706,6 +730,10 @@ public function testUpdateRole()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);

Expand Down Expand Up @@ -772,6 +800,10 @@ public function testUpdateRoleThrowsInvalidArgumentException()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);

Expand Down Expand Up @@ -830,6 +862,10 @@ public function testDeleteRole()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);

Expand Down Expand Up @@ -924,13 +960,13 @@ public function testAddPolicy()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'delete')
);
$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);

$role = $roleService->addPolicy(
$role,
$roleService->newPolicyCreateStruct('content', 'delete')
);
$role = $roleService->addPolicy(
$role,
$roleService->newPolicyCreateStruct('content', 'create')
Expand Down Expand Up @@ -1047,6 +1083,10 @@ public function testAddPolicyUpdatesRole()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'read')
);
$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);

Expand Down Expand Up @@ -1146,6 +1186,30 @@ public function testAddPolicyByRoleDraftSetsPolicyProperties($roleAndPolicy)
);
}

/**
* Test for the publishRoleDraft() method.
*
* @expectedException \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
* @depends eZ\Publish\API\Repository\Tests\RoleServiceTest::testCreateRole
*/
public function testPublishEmptyRoleThrowsInvalidArgumentException()
{
$repository = $this->getRepository();

/* BEGIN: Use Case */
$roleService = $repository->getRoleService();

$roleCreate = $roleService->newRoleCreateStruct('Lumberjack');

// @todo uncomment when support for multilingual names and descriptions is added EZP-24776
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
// This call will fail with an InvalidArgumentException, because the role has no policies
$roleService->publishRoleDraft($roleDraft);
/* END: Use Case */
}

/**
* Test for the addPolicy() method.
*
Expand All @@ -1167,6 +1231,11 @@ public function testAddPolicyThrowsLimitationValidationException()
// $roleCreate->mainLanguageCode = 'eng-US';

$roleDraft = $roleService->createRole($roleCreate);
$roleService->addPolicyByRoleDraft(
$roleDraft,
$roleService->newPolicyCreateStruct('content', 'create')
);

$roleService->publishRoleDraft($roleDraft);
$role = $roleService->loadRole($roleDraft->id);

Expand Down
7 changes: 6 additions & 1 deletion eZ/Publish/API/Repository/Tests/TrashServiceAuthorizationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ public function testTrashThrowsUnauthorizedException()

// switch user context before testing TrashService::trash method
$repository->getPermissionResolver()->setCurrentUserReference(
$this->createUserWithPolicies('trash_test_user', [])
$this->createUserWithPolicies(
'trash_test_user',
[
['module' => 'content', 'function' => 'read'],
]
)
);
$trashService->trash($mediaLocation);
}
Expand Down
7 changes: 3 additions & 4 deletions eZ/Publish/Core/Repository/RoleService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,12 @@ public function publishRoleDraft(APIRoleDraft $roleDraft)
);
}

// TODO: Uncomment when role policy editing is done, see EZP-24711 & EZP-24713
/*if (count($loadedRoleDraft->getPolicies()) === 0) {
if (count($loadedRoleDraft->getPolicies()) === 0) {
throw new InvalidArgumentException(
"\$roleDraft",
'$roleDraft',
'The role draft should have at least one policy.'
);
}*/
}

$this->repository->beginTransaction();
try {
Expand Down