From 3bebc7a18cb35d998f456f29a88398c8c2a6bf48 Mon Sep 17 00:00:00 2001 From: Marouan Bentaleb <38426175+marouanbentaleb@users.noreply.github.com> Date: Fri, 30 Aug 2019 16:32:14 +0100 Subject: [PATCH] [ADF-4840] Fixing failing tests on process-services-cloud (#5013) * [ADF-4840] Fixing dropdown-widget.e2e.ts-beforeEach and start-task-group-cloud.e2e.ts-afterAll * [ADF-4840] Testing with apps deployed with different permissions * [ADF-4840] Fixing edit-process-filters-component.e2e.ts * [ADF-4840] Add space to lib/process-services-cloud * [ADF-4840] Fixing people-group-cloud-filter-component and reverting changes to the appNames * [ADF-4840] Fixing start-task-custom-app-cloud --- .../edit-process-filters-component.e2e.ts | 18 ------ .../form-field/dropdown-widget.e2e.ts | 2 - ...people-group-cloud-filter-component.e2e.ts | 58 +++++++++---------- .../start-task-custom-app-cloud.e2e.ts | 4 +- .../start-task/start-task-group-cloud.e2e.ts | 3 +- 5 files changed, 33 insertions(+), 52 deletions(-) diff --git a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts index 8f8596e9f7..910f2c344a 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -70,14 +70,10 @@ describe('Edit process filters cloud', () => { const editProcessFilterCloud = processCloudDemoPage.editProcessFilterCloudComponent(); await editProcessFilterCloud.clickCustomiseFilterHeader(); await editProcessFilterCloud.checkCustomiseFilterHeaderIsExpanded(); - }); - - afterEach(async () => { await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); }); it('[C291804] Delete Save and Save as actions should be displayed when clicking on custom filter header', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('All Processes'); await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsDisplayed(); @@ -90,8 +86,6 @@ describe('Edit process filters cloud', () => { }); it('[C291805] New process filter is added when clicking Save As button', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); @@ -115,8 +109,6 @@ describe('Edit process filters cloud', () => { }); it('[C291806] Two process filters with same name can be created when clicking the Save As button', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('New'); @@ -153,8 +145,6 @@ describe('Edit process filters cloud', () => { }); it('[C291807] A process filter is overrided when clicking on save button', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); @@ -181,8 +171,6 @@ describe('Edit process filters cloud', () => { }); it('[C291808] A process filter is deleted when clicking on delete button', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); @@ -203,8 +191,6 @@ describe('Edit process filters cloud', () => { }); it('[C291810] Process filter should not be created when process filter dialog is closed', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); @@ -223,8 +209,6 @@ describe('Edit process filters cloud', () => { }); it('[C291811] Save button of process filter dialog should be disabled when process name is empty', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); @@ -243,8 +227,6 @@ describe('Edit process filters cloud', () => { }); it('[C291809] Process filter dialog is displayed when clicking on Save As button', async () => { - await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Name'); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); diff --git a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts index 34a39d2f3b..4d98e627b0 100644 --- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts +++ b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts @@ -107,8 +107,6 @@ describe('Form Field Component - Dropdown Widget', () => { await navigationBarPage.navigateToProcessServicesCloudPage(); await appListCloudComponent.checkApsContainer(); await appListCloudComponent.goToApp(simpleApp); - - await identityService.deleteIdentityUser(testUser.idIdentityService); }); it('[C290069] Should be able to read rest service dropdown options, save and complete the task form', async () => { 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 b7cf48ad5e..57a8a7d021 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 @@ -61,7 +61,7 @@ describe('People Groups Cloud Component', () => { groupNoRole = await groupIdentityService.createIdentityGroup(); - users = [`${apsUser.idIdentityService}`, `${noRoleUser.idIdentityService}`, `${testUser.idIdentityService}`]; + users = [apsUser.idIdentityService, noRoleUser.idIdentityService, testUser.idIdentityService]; await settingsPage.setProviderBpmSso( browser.params.config.bpmHost, @@ -94,57 +94,57 @@ describe('People Groups Cloud Component', () => { await peopleGroupCloudComponentPage.checkPeopleCloudSingleSelectionIsSelected(); await peopleGroupCloudComponentPage.clickPeopleFilerByApp(); await peopleGroupCloudComponentPage.enterPeopleAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); - await peopleCloudComponent.searchAssignee(`${testUser.firstName}`); - await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName}` + ' ' + `${testUser.lastName}`); - await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName}` + ' ' + `${testUser.lastName}`); + await peopleCloudComponent.searchAssignee(testUser.firstName); + await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`); + await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`); await browser.sleep(100); - await expect(await peopleCloudComponent.getAssigneeFieldContent()).toBe(`${testUser.firstName}` + ' ' + `${testUser.lastName}`); + await expect(await peopleCloudComponent.getAssigneeFieldContent()).toBe(`${testUser.firstName} ${testUser.lastName}`); }); it('[C305041] Should filter the People Multiple Selection with the Application name filter', async () => { await peopleGroupCloudComponentPage.clickPeopleCloudMultipleSelection(); await peopleGroupCloudComponentPage.clickPeopleFilerByApp(); await peopleGroupCloudComponentPage.enterPeopleAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); - await peopleCloudComponent.searchAssignee(`${testUser.firstName}`); - await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName}` + ' ' + `${testUser.lastName}`); - await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName}` + ' ' + `${testUser.lastName}`); - await peopleCloudComponent.checkSelectedPeople(`${testUser.firstName}` + ' ' + `${testUser.lastName}`); + await peopleCloudComponent.searchAssignee(testUser.firstName); + await peopleCloudComponent.checkUserIsDisplayed(`${testUser.firstName} ${testUser.lastName}`); + await peopleCloudComponent.selectAssigneeFromList(`${testUser.firstName} ${testUser.lastName}`); + await peopleCloudComponent.checkSelectedPeople(`${testUser.firstName} ${testUser.lastName}`); - await peopleCloudComponent.searchAssigneeToExisting(`${apsUser.firstName}`); - await peopleCloudComponent.checkUserIsDisplayed(`${apsUser.firstName}` + ' ' + `${apsUser.lastName}`); - await peopleCloudComponent.selectAssigneeFromList(`${apsUser.firstName}` + ' ' + `${apsUser.lastName}`); - await peopleCloudComponent.checkSelectedPeople(`${apsUser.firstName}` + ' ' + `${apsUser.lastName}`); + await peopleCloudComponent.searchAssigneeToExisting(apsUser.firstName); + await peopleCloudComponent.checkUserIsDisplayed(`${apsUser.firstName} ${apsUser.lastName}`); + await peopleCloudComponent.selectAssigneeFromList(`${apsUser.firstName} ${apsUser.lastName}`); + await peopleCloudComponent.checkSelectedPeople(`${apsUser.firstName} ${apsUser.lastName}`); - await peopleCloudComponent.searchAssigneeToExisting(`${noRoleUser.firstName}`); - await peopleCloudComponent.checkUserIsNotDisplayed(`${noRoleUser.firstName}` + ' ' + `${noRoleUser.lastName}`); + await peopleCloudComponent.searchAssigneeToExisting(noRoleUser.firstName); + await peopleCloudComponent.checkUserIsNotDisplayed(`${noRoleUser.firstName} ${noRoleUser.lastName}`); }); it('[C305041] Should filter the Groups Single Selection with the Application name filter', async () => { await peopleGroupCloudComponentPage.clickGroupCloudSingleSelection(); await peopleGroupCloudComponentPage.clickGroupFilerByApp(); await peopleGroupCloudComponentPage.enterGroupAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); - await groupCloudComponentPage.searchGroups(`${hrGroup.name}`); - await groupCloudComponentPage.checkGroupIsDisplayed(`${hrGroup.name}`); - await groupCloudComponentPage.selectGroupFromList(`${hrGroup.name}`); - await expect(await groupCloudComponentPage.getGroupsFieldContent()).toBe(`${hrGroup.name}`); + await groupCloudComponentPage.searchGroups(hrGroup.name); + await groupCloudComponentPage.checkGroupIsDisplayed(hrGroup.name); + await groupCloudComponentPage.selectGroupFromList(hrGroup.name); + await expect(await groupCloudComponentPage.getGroupsFieldContent()).toBe(hrGroup.name); }); it('[C305041] Should filter the Groups Multiple Selection with the Application name filter', async () => { await peopleGroupCloudComponentPage.clickGroupCloudMultipleSelection(); await peopleGroupCloudComponentPage.clickGroupFilerByApp(); await peopleGroupCloudComponentPage.enterGroupAppName(resources.ACTIVITI7_APPS.SIMPLE_APP.name); - await groupCloudComponentPage.searchGroups(`${testGroup.name}`); - await groupCloudComponentPage.checkGroupIsDisplayed(`${testGroup.name}`); - await groupCloudComponentPage.selectGroupFromList(`${testGroup.name}`); - await groupCloudComponentPage.checkSelectedGroup(`${testGroup.name}`); + await groupCloudComponentPage.searchGroups(testGroup.name); + await groupCloudComponentPage.checkGroupIsDisplayed(testGroup.name); + await groupCloudComponentPage.selectGroupFromList(testGroup.name); + await groupCloudComponentPage.checkSelectedGroup(testGroup.name); - await groupCloudComponentPage.searchGroupsToExisting(`${hrGroup.name}`); - await groupCloudComponentPage.checkGroupIsDisplayed(`${hrGroup.name}`); - await groupCloudComponentPage.selectGroupFromList(`${hrGroup.name}`); - await groupCloudComponentPage.checkSelectedGroup(`${hrGroup.name}`); + await groupCloudComponentPage.searchGroupsToExisting(hrGroup.name); + await groupCloudComponentPage.checkGroupIsDisplayed(hrGroup.name); + await groupCloudComponentPage.selectGroupFromList(hrGroup.name); + await groupCloudComponentPage.checkSelectedGroup(hrGroup.name); - await groupCloudComponentPage.searchGroupsToExisting(`${groupNoRole.name}`); - await groupCloudComponentPage.checkGroupIsNotDisplayed(`${groupNoRole.name}`); + await groupCloudComponentPage.searchGroupsToExisting(groupNoRole.name); + await groupCloudComponentPage.checkGroupIsNotDisplayed(groupNoRole.name); }); }); diff --git 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 index 110975c0b4..8d2d0216e3 100644 --- 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 @@ -133,10 +133,10 @@ describe('Start Task', () => { it('[C291956] Should be able to create a new standalone task without assignee', async () => { await tasksCloudDemoPage.openNewTaskForm(); await startTask.checkFormIsDisplayed(); - await expect(await peopleCloudComponent.getAssignee()).toContain(testUser.firstName, 'does not contain Admin'); + await peopleCloudComponent.clearAssignee(); await startTask.addName(unassignedTaskName); - await startTask.clickStartButton(); await startTask.checkStartButtonIsEnabled(); + await startTask.clickStartButton(); await tasksCloudDemoPage.editTaskFilterCloudComponent(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CREATED'); 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 161cfbcd4b..7b826863d0 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 @@ -82,7 +82,7 @@ describe('Start Task - Group Cloud Component', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.login(testUser.email, testUser.password); const tasksService = new TasksService(apiService); const bothGroupsTaskId = await tasksService.getTaskId(bothGroupsTaskName, simpleApp); @@ -91,6 +91,7 @@ describe('Start Task - Group Cloud Component', () => { const oneGroupTaskId = await tasksService.getTaskId(oneGroupTaskName, simpleApp); await tasksService.deleteTask(oneGroupTaskId, simpleApp); + await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); await identityService.deleteIdentityUser(apsUser.idIdentityService); await identityService.deleteIdentityUser(testUser.idIdentityService);