From e351925e8f0ec2253ca616694d764599b0f6326b Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Tue, 22 Sep 2020 19:53:58 +0200 Subject: [PATCH] Fix C291954, C291955, C291993 and C291995 (#6149) Co-authored-by: Eugenio Romano --- ...people-group-cloud-filter-component.e2e.ts | 6 +++--- .../start-task/start-task-group-cloud.e2e.ts | 21 +++++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts index 23582c0394..f6fb4e93ce 100644 --- a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts @@ -47,8 +47,8 @@ describe('People Groups Cloud Component', () => { hrGroup = await groupIdentityService.getGroupInfoByGroupName('hr'); testGroup = await groupIdentityService.getGroupInfoByGroupName('testgroup'); - testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); - apsUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); + testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); + apsUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); await identityService.addUserToGroup(testUser.idIdentityService, testGroup.id); await identityService.addUserToGroup(apsUser.idIdentityService, hrGroup.id); noRoleUser = await identityService.createIdentityUser(); @@ -137,5 +137,5 @@ describe('People Groups Cloud Component', () => { await groupCloudComponentPage.searchGroupsToExisting(groupNoRole.name); await groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name); }); - }); + }); }); diff --git 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 index c27b11f8f4..4493535517 100644 --- 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 @@ -28,7 +28,7 @@ import { TasksService, ApiService, IdentityService, - GroupIdentityService, RolesService + GroupIdentityService } from '@alfresco/adf-testing'; describe('Start Task - Group Cloud Component', () => { @@ -46,7 +46,6 @@ describe('Start Task - Group Cloud Component', () => { const apiService = new ApiService(); const identityService = new IdentityService(apiService); const groupIdentityService = new GroupIdentityService(apiService); - const rolesService = new RolesService(apiService); const bothGroupsTaskName = StringUtil.generateRandomString(5); const oneGroupTaskName = StringUtil.generateRandomString(5); @@ -56,16 +55,15 @@ describe('Start Task - Group Cloud Component', () => { await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); testUser = await identityService.createIdentityUser(); - apsUser = await identityService.createIdentityUser(); - hrGroup = await groupIdentityService.getGroupInfoByGroupName('hr'); - testGroup = await groupIdentityService.createIdentityGroup(); - const apsAdminRoleId = await rolesService.getRoleIdByRoleName(identityService.ROLES.ACTIVITI_USER); - await groupIdentityService.assignRole(testGroup.id, apsAdminRoleId, identityService.ROLES.ACTIVITI_USER); + apsUser = await identityService.createIdentityUser(); + testGroup = await groupIdentityService.getGroupInfoByGroupName('testgroup'); - await identityService.addUserToGroup(testUser.idIdentityService, testGroup.id); - await identityService.addUserToGroup(apsUser.idIdentityService, hrGroup.id); + await identityService.addUserToGroup(testUser.idIdentityService, hrGroup.id); + await identityService.addUserToGroup(apsUser.idIdentityService, testGroup.id); + + await loginSSOPage.login(testUser.email, testUser.password); }); afterAll(async () => { @@ -84,7 +82,6 @@ describe('Start Task - Group Cloud Component', () => { }); beforeEach(async () => { - await loginSSOPage.login(testUser.email, testUser.password); await navigationBarPage.navigateToProcessServicesCloudPage(); await appListCloudComponent.checkApsContainer(); await appListCloudComponent.checkAppIsDisplayed(simpleApp); @@ -94,10 +91,6 @@ describe('Start Task - Group Cloud Component', () => { await startTask.checkFormIsDisplayed(); }); - afterEach(async () => { - await navigationBarPage.clickLogoutButton(); - }); - it('[C291954] Should be able to select/delete an group for a standalone task', async () => { await peopleCloudComponent.clearAssignee();