[DW-1560] switch to ACTIVITI roles (#5175)

* switch to ACTIVITI roles

* double set of roles

* minor typing fixes

* use different account

* Revert "use different account"

This reverts commit 1f89fb490e8be1614fbdef391ddc8a536ec8de82.

* fix test
This commit is contained in:
Denys Vuika
2019-10-30 17:28:01 +00:00
committed by Eugenio Romano
parent 65c66528de
commit a4730cd9cf
28 changed files with 73 additions and 67 deletions

View File

@@ -66,8 +66,8 @@ describe('Start Task', () => {
identityService = new IdentityService(apiService);
groupIdentityService = new GroupIdentityService(apiService);
testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
apsUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER, identityService.ROLES.ACTIVITI_USER]);
testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
apsUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER, identityService.ROLES.ACTIVITI_USER]);
activitiUser = await identityService.createIdentityUser();
groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');

View File

@@ -67,8 +67,8 @@ describe('Start Task - Group Cloud Component', () => {
testGroup = await groupIdentityService.getGroupInfoByGroupName('testgroup');
const rolesService = new RolesService(apiService);
const apsAdminRoleId = await rolesService.getRoleIdByRoleName(identityService.ROLES.APS_USER);
await groupIdentityService.assignRole(testGroup.id, apsAdminRoleId, identityService.ROLES.APS_USER);
const apsAdminRoleId = await rolesService.getRoleIdByRoleName(identityService.ROLES.ACTIVITI_USER);
await groupIdentityService.assignRole(testGroup.id, apsAdminRoleId, identityService.ROLES.ACTIVITI_USER);
await identityService.addUserToGroup(testUser.idIdentityService, testGroup.id);
await identityService.addUserToGroup(apsUser.idIdentityService, hrGroup.id);