[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
2025-07-24 17:32:15 +00:00 · 2019-10-30 17:28:01 +00:00
parent 65c66528de
commit a4730cd9cf
28 changed files with 73 additions and 67 deletions
--- a/e2e/process-services-cloud/apps-section-cloud.e2e.ts
+++ b/e2e/process-services-cloud/apps-section-cloud.e2e.ts
@@ -45,7 +45,7 @@ describe('Applications list', () => {
    beforeAll(async () => {
        await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
        identityService = new IdentityService(apiService);
-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER, identityService.ROLES.APS_DEVOPS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER, identityService.ROLES.ACTIVITI_DEVOPS]);
        await settingsPage.setProviderBpmSso(
            browser.params.config.bpmHost,
            browser.params.config.oauth2.host,
--- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts
+++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts
@@ -42,7 +42,7 @@ describe('Edit process filters cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts
+++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts
@@ -52,7 +52,7 @@ describe('Edit task filters cloud', () => {
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
            tasksService = new TasksService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts
+++ b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts
@@ -66,7 +66,7 @@ describe('Form Field Component - Dropdown Widget', () => {
        await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
        identityService = new IdentityService(apiService);
        groupIdentityService = new GroupIdentityService(apiService);
-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

        groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts
+++ b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts
@@ -279,7 +279,7 @@ describe('Task cloud visibility', async () => {
        await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
        identityService = new IdentityService(apiService);
        groupIdentityService = new GroupIdentityService(apiService);
-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
        groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts
+++ b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts
@@ -38,14 +38,15 @@ describe('People Groups Cloud Component', () => {
            browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers
        );

-        let apsUser, testUser;
+        let apsUser;
+        let testUser;
        let activitiUser;
        let noRoleUser;
        let groupUser;
        let groupAdmin;
        let groupNoRole;
-        let apsUserRoleId;
-        let apsAdminRoleId;
+        let apsUserRoleId: string;
+        let apsAdminRoleId: string;
        let users = [];
        let groups = [];

@@ -54,22 +55,22 @@ describe('People Groups Cloud Component', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);

            identityService = new IdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
-            apsUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
+            apsUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            activitiUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            noRoleUser = await identityService.createIdentityUser();

            rolesService = new RolesService(apiService);
-            apsAdminRoleId = await rolesService.getRoleIdByRoleName(identityService.ROLES.APS_ADMIN);
-            apsUserRoleId = await rolesService.getRoleIdByRoleName(identityService.ROLES.APS_USER);
+            apsAdminRoleId = await rolesService.getRoleIdByRoleName(identityService.ROLES.ACTIVITI_ADMIN);
+            apsUserRoleId = await rolesService.getRoleIdByRoleName(identityService.ROLES.ACTIVITI_USER);

            groupIdentityService = new GroupIdentityService(apiService);

            groupUser = await groupIdentityService.createIdentityGroup();
-            await groupIdentityService.assignRole(groupUser.id, apsUserRoleId, identityService.ROLES.APS_USER);
+            await groupIdentityService.assignRole(groupUser.id, apsUserRoleId, identityService.ROLES.ACTIVITI_USER);

            groupAdmin = await groupIdentityService.createIdentityGroup();
-            await groupIdentityService.assignRole(groupAdmin.id, apsAdminRoleId, identityService.ROLES.APS_ADMIN);
+            await groupIdentityService.assignRole(groupAdmin.id, apsAdminRoleId, identityService.ROLES.ACTIVITI_ADMIN);

            groupNoRole = await groupIdentityService.createIdentityGroup();

@@ -124,7 +125,7 @@ describe('People Groups Cloud Component', () => {
            });

            it('One role filtering', async () => {
-                await peopleGroupCloudComponentPage.enterPeopleRoles(`["${identityService.ROLES.APS_USER}"]`);
+                await peopleGroupCloudComponentPage.enterPeopleRoles(`["${identityService.ROLES.ACTIVITI_USER}"]`);
                await peopleCloudComponent.searchAssignee(apsUser.lastName);
                await peopleCloudComponent.checkUserIsDisplayed(`${apsUser.firstName} ${apsUser.lastName}`);
                await peopleCloudComponent.searchAssignee(testUser.lastName);
@@ -135,7 +136,7 @@ describe('People Groups Cloud Component', () => {
            });

            it('Multiple roles filtering', async () => {
-                await peopleGroupCloudComponentPage.enterPeopleRoles(`["${identityService.ROLES.APS_USER}", "${identityService.ROLES.ACTIVITI_USER}"]`);
+                await peopleGroupCloudComponentPage.enterPeopleRoles(`["${identityService.ROLES.ACTIVITI_USER}", "${identityService.ROLES.ACTIVITI_USER}"]`);
                await peopleCloudComponent.searchAssignee(apsUser.lastName);
                await peopleCloudComponent.checkUserIsDisplayed(`${apsUser.firstName} ${apsUser.lastName}`);
                await peopleCloudComponent.searchAssignee(testUser.lastName);
@@ -164,7 +165,7 @@ describe('People Groups Cloud Component', () => {
            });

            it('One role filtering', async () => {
-                await peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.ROLES.APS_ADMIN}"]`);
+                await peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.ROLES.ACTIVITI_ADMIN}"]`);
                await groupCloudComponentPage.searchGroups(groupAdmin.name);
                await groupCloudComponentPage.checkGroupIsDisplayed(groupAdmin.name);
                await groupCloudComponentPage.searchGroups(groupUser.name);
@@ -174,8 +175,8 @@ describe('People Groups Cloud Component', () => {
                await groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name);
            });

-            it('[C309996] Should be able to filter groups based on composite roles Aps_User', async () => {
-                await peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.ROLES.APS_USER}"]`);
+            it('[C309996] Should be able to filter groups based on composite roles ACTIVITI_USER', async () => {
+                await peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.ROLES.ACTIVITI_USER}"]`);
                await groupCloudComponentPage.searchGroups(groupAdmin.name);
                await groupCloudComponentPage.checkGroupIsNotDisplayed(groupAdmin.name);
                await groupCloudComponentPage.searchGroups(groupNoRole.name);
@@ -185,7 +186,7 @@ describe('People Groups Cloud Component', () => {
            });

            it('Multiple roles filtering', async () => {
-                await peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.ROLES.APS_ADMIN}", "${identityService.ROLES.APS_USER}"]`);
+                await peopleGroupCloudComponentPage.enterGroupRoles(`["${identityService.ROLES.ACTIVITI_ADMIN}", "${identityService.ROLES.ACTIVITI_USER}"]`);
                await groupCloudComponentPage.searchGroups(groupAdmin.name);
                await groupCloudComponentPage.checkGroupIsDisplayed(groupAdmin.name);
                await groupCloudComponentPage.searchGroups(groupUser.name);
--- a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts
+++ b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts
@@ -52,8 +52,8 @@ describe('People Groups Cloud Component', () => {
            hrGroup = await groupIdentityService.getGroupInfoByGroupName('hr');
            testGroup = await groupIdentityService.getGroupInfoByGroupName('testgroup');

-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
-            apsUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
+            apsUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            await identityService.addUserToGroup(testUser.idIdentityService, testGroup.id);
            await identityService.addUserToGroup(apsUser.idIdentityService, hrGroup.id);
            noRoleUser = await identityService.createIdentityUser();
--- a/e2e/process-services-cloud/process-custom-filters.e2e.ts
+++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts
@@ -61,7 +61,7 @@ describe('Process list cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/process-filter-results.e2e.ts
+++ b/e2e/process-services-cloud/process-filter-results.e2e.ts
@@ -68,8 +68,8 @@ describe('Process filters cloud', () => {
        identityService = new IdentityService(apiService);
        groupIdentityService = new GroupIdentityService(apiService);

-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
-        anotherUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
+        anotherUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

        groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts
+++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts
@@ -60,7 +60,7 @@ describe('Process filters cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/process-header-cloud.e2e.ts
+++ b/e2e/process-services-cloud/process-header-cloud.e2e.ts
@@ -71,7 +71,7 @@ describe('Process Header cloud component', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts
+++ b/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts
@@ -48,7 +48,7 @@ describe('Process list cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts
+++ b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts
@@ -53,7 +53,7 @@ describe('Process list cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
+++ b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts
@@ -50,7 +50,7 @@ describe('Process list cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/start-process-cloud.e2e.ts
+++ b/e2e/process-services-cloud/start-process-cloud.e2e.ts
@@ -49,7 +49,7 @@ describe('Start Process', () => {
        await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
        identityService = new IdentityService(apiService);
        groupIdentityService = new GroupIdentityService(apiService);
-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
        groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
        await settingsPage.setProviderBpmSso(
--- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts
+++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts
@@ -105,7 +105,7 @@ describe('Start Task Form', () => {

        identityService = new IdentityService(apiService);
        groupIdentityService = new GroupIdentityService(apiService);
-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
        groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts
+++ b/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts
@@ -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');
--- a/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts
+++ b/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts
@@ -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);
--- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts
+++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts
@@ -42,7 +42,7 @@ describe('Task filters cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts
+++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts
@@ -89,7 +89,7 @@ describe('Task form cloud component', () => {
        const groupIdentityService = new GroupIdentityService(apiService);
        const formCloudService = new FormCloudService(apiService);

-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

        const groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/task-header-cloud.e2e.ts
+++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts
@@ -57,7 +57,7 @@ describe('Task Header cloud component', () => {
        await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
        identityService = new IdentityService(apiService);
        groupIdentityService = new GroupIdentityService(apiService);
-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

        groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts
+++ b/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts
@@ -49,7 +49,7 @@ describe('Process list cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);
            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);

--- a/e2e/process-services-cloud/task-list-properties.e2e.ts
+++ b/e2e/process-services-cloud/task-list-properties.e2e.ts
@@ -61,7 +61,7 @@ describe('Edit task filters and task list properties', () => {
        tasksService = new TasksService(apiService);
        const settingsPage = new SettingsPage();

-        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+        testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

        groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
        await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/task-list-selection.e2e.ts
+++ b/e2e/process-services-cloud/task-list-selection.e2e.ts
@@ -49,7 +49,7 @@ describe('Task list cloud - selection', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts
+++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts
@@ -63,7 +63,7 @@ describe('Task filters cloud', () => {
            await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password);
            identityService = new IdentityService(apiService);
            groupIdentityService = new GroupIdentityService(apiService);
-            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.APS_USER]);
+            testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]);

            groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr');
            await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id);
--- a/lib/testing/src/lib/core/actions/identity/identity.service.ts
+++ b/lib/testing/src/lib/core/actions/identity/identity.service.ts
@@ -30,11 +30,10 @@ export class IdentityService {
    }

    ROLES = {
-        APS_USER: 'APS_USER',
        ACTIVITI_USER: 'ACTIVITI_USER',
-        APS_ADMIN: 'APS_ADMIN',
        ACTIVITI_ADMIN: 'ACTIVITI_ADMIN',
-        APS_DEVOPS_USER: 'APS_DEVOPS'
+        ACTIVITI_DEVOPS: 'ACTIVITI_DEVOPS',
+        ACTIVITI_IDENTITY: 'ACTIVITI_IDENTITY'
    };

    async createIdentityUserWithRole(apiService: ApiService, roles: string[]): Promise<any> {
--- a/lib/testing/src/lib/core/actions/identity/roles.service.ts
+++ b/lib/testing/src/lib/core/actions/identity/roles.service.ts
@@ -28,49 +28,49 @@ export class RolesService {
    async createRole(roleName: string): Promise<any> {
        const path = '/roles';
        const method = 'POST';
-        const queryParams = {}, postBody = {
+        const queryParams = {};
+        const postBody = {
            name: roleName + 'TestRole'
        };
-        const data = await this.api.performIdentityOperation(path, method, queryParams, postBody);
-        return data;
+
+        return this.api.performIdentityOperation(path, method, queryParams, postBody);
    }

-    async deleteRole(roleId): Promise<any> {
+    async deleteRole(roleId: string): Promise<any> {
        const path = `/roles-by-id/${roleId}`;
        const method = 'DELETE';
        const queryParams = {}, postBody = {};
-        const data = await this.api.performIdentityOperation(path, method, queryParams, postBody);
-        return data;
+
+        return this.api.performIdentityOperation(path, method, queryParams, postBody);
    }

-    async getRoleIdByRoleName(roleName): Promise<any> {
+    async getRoleIdByRoleName(roleName: string): Promise<string> {
        const path = `/roles`;
        const method = 'GET';
-        let roleId;
        const queryParams = {}, postBody = {};

        const data = await this.api.performIdentityOperation(path, method, queryParams, postBody);
        for (const key in data) {
            if (data[key].name === roleName) {
-                roleId = data[key].id;
+                return data[key].id;
            }
        }
-        return roleId;
+        return undefined;
    }

-    async getClientRoleIdByRoleName(groupId, clientId, clientRoleName): Promise<any> {
+    async getClientRoleIdByRoleName(groupId: string, clientId: string, clientRoleName: string): Promise<any> {
        const path = `/groups/${groupId}/role-mappings/clients/${clientId}/available`;
        const method = 'GET';
-        let clientRoleId;
-        const queryParams = {}, postBody = {};
+        const queryParams = {};
+        const postBody = {};

        const data = await this.api.performIdentityOperation(path, method, queryParams, postBody);
        for (const key in data) {
            if (data[key].name === clientRoleName) {
-                clientRoleId = data[key].id;
+                return data[key].id;
            }
        }
-        return clientRoleId;
+        return undefined;
    }

 }
--- a/lib/testing/src/lib/process-services-cloud/resources/resources.ts
+++ b/lib/testing/src/lib/process-services-cloud/resources/resources.ts
@@ -31,9 +31,11 @@ export const ACTIVITI_CLOUD_APPS: any = {
            formtotestvalidations: 'formtotestvalidations'
        },
        security: [
+            {'role': 'ACTIVITI_ADMIN', 'groups': [], 'users': ['superadminuser']},
+            {'role': 'ACTIVITI_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser'] },
            {'role': 'APS_ADMIN', 'groups': [], 'users': ['superadminuser']},
-            {'role': 'APS_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser']
-        }]
+            {'role': 'APS_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser'] }
+        ]
    },
    SIMPLE_APP: {
        name: 'simpleapp',
@@ -95,16 +97,20 @@ export const ACTIVITI_CLOUD_APPS: any = {
            }
        },
        security: [
+            {'role': 'ACTIVITI_ADMIN', 'groups': [], 'users': ['superadminuser']},
+            {'role': 'ACTIVITI_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser']},
            {'role': 'APS_ADMIN', 'groups': [], 'users': ['superadminuser']},
-            {'role': 'APS_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser']
-        }]
+            {'role': 'APS_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser'] }
+        ]
    },
    SUB_PROCESS_APP: {
        name: 'subprocessapp',
        file_location: 'https://github.com/Alfresco/alfresco-ng2-components/blob/development/e2e/resources/activiti7/subprocessapp.zip?raw=true',
        security: [
+            {'role': 'ACTIVITI_ADMIN', 'groups': [], 'users': ['superadminuser']},
+            {'role': 'ACTIVITI_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser']},
            {'role': 'APS_ADMIN', 'groups': [], 'users': ['superadminuser']},
-            {'role': 'APS_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser']
-        }]
+            {'role': 'APS_USER', 'groups': ['hr', 'testgroup'], 'users': ['hruser'] }
+        ]
    }
 };