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 910f2c344a..be93e914c3 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -68,7 +68,7 @@ describe('Edit process filters cloud', () => { await tasksCloudDemoPage.taskListCloudComponent().checkTaskListIsLoaded(); await processCloudDemoPage.clickOnProcessFilters(); const editProcessFilterCloud = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloud.clickCustomiseFilterHeader(); + await editProcessFilterCloud.openFilter(); await editProcessFilterCloud.checkCustomiseFilterHeaderIsExpanded(); await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); }); @@ -82,7 +82,7 @@ describe('Edit process filters cloud', () => { await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsEnabled()).toEqual(false); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveAsButtonIsEnabled()).toEqual(false); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkDeleteButtonIsEnabled()).toEqual(true); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); }); it('[C291805] New process filter is added when clicking Save As button', async () => { @@ -96,7 +96,7 @@ describe('Edit process filters cloud', () => { await browser.driver.sleep(1000); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('New'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsEnabled()).toEqual(false); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveAsButtonIsEnabled()).toEqual(false); @@ -116,7 +116,7 @@ describe('Edit process filters cloud', () => { await browser.driver.sleep(1000); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('New'); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); @@ -126,7 +126,7 @@ describe('Edit process filters cloud', () => { await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('New'); await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnSaveButton(); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded(); await browser.driver.sleep(1000); @@ -138,7 +138,7 @@ describe('Edit process filters cloud', () => { await browser.driver.sleep(1000); await processCloudDemoPage.customProcessFilter('custom-new').clickProcessFilter(); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded(); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton(); @@ -154,13 +154,13 @@ describe('Edit process filters cloud', () => { await browser.driver.sleep(1000); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('New'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded(); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Name'); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name'); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveButton(); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded(); await browser.driver.sleep(1000); @@ -179,7 +179,7 @@ describe('Edit process filters cloud', () => { await browser.driver.sleep(1000); await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnSaveButton(); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('New'); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton(); @@ -201,11 +201,11 @@ describe('Edit process filters cloud', () => { await expect(await processCloudDemoPage.getActiveFilterName()).toEqual('All Processes'); await processCloudDemoPage.runningProcessesFilter().clickProcessFilter(); await expect(await processCloudDemoPage.getActiveFilterName()).toEqual('Running Processes'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); await expect(await processCloudDemoPage.getActiveFilterName()).toEqual('All Processes'); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); }); it('[C291811] Save button of process filter dialog should be disabled when process name is empty', async () => { @@ -219,7 +219,7 @@ describe('Edit process filters cloud', () => { await expect(await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().checkCancelButtonIsEnabled()).toEqual(true); await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnCancelButton(); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().checkCustomiseFilterHeaderIsExpanded(); await processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('StartDate'); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate'); diff --git a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts index df195c1425..15afb150dd 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts @@ -86,7 +86,7 @@ describe('Edit task filters cloud', () => { }); it('[C291785] All the filters property should be set up accordingly with the Query Param', async () => { - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getStatusFilterDropDownValue()).toEqual('ASSIGNED'); @@ -102,12 +102,12 @@ describe('Edit task filters cloud', () => { await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getOrderFilterDropDownValue()).toEqual('DESC'); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(assignedTaskName); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(completedTaskName); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); }); it('[C306896] Delete Save and Save as actions should be displayed when clicking on custom filter header', async () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); const editTaskFilterCloudComponent = tasksCloudDemoPage.editTaskFilterCloudComponent(); @@ -119,14 +119,14 @@ describe('Edit task filters cloud', () => { await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().checkSaveButtonIsEnabled()).toEqual(false); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().checkSaveAsButtonIsEnabled()).toEqual(false); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().checkDeleteButtonIsEnabled()).toEqual(true); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); }); it('[C291795] New filter is added when clicking Save As button', async () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); const editTaskFilterCloudComponent = tasksCloudDemoPage.editTaskFilterCloudComponent(); - await editTaskFilterCloudComponent.clickCustomiseFilterHeader(); + await editTaskFilterCloudComponent.openFilter(); await editTaskFilterCloudComponent.setSortFilterDropDown('Id'); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); @@ -138,7 +138,7 @@ describe('Edit task filters cloud', () => { await editTaskFilterDialog.clickOnSaveButton(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('New'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().checkSaveButtonIsEnabled()).toEqual(false); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().checkSaveAsButtonIsEnabled()).toEqual(false); @@ -154,7 +154,7 @@ describe('Edit task filters cloud', () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); const editTaskFilterCloudComponent = tasksCloudDemoPage.editTaskFilterCloudComponent(); - await editTaskFilterCloudComponent.clickCustomiseFilterHeader(); + await editTaskFilterCloudComponent.openFilter(); await editTaskFilterCloudComponent.setSortFilterDropDown('Id'); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); @@ -166,7 +166,7 @@ describe('Edit task filters cloud', () => { await editTaskFilterDialog.clickOnSaveButton(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('New'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('Priority'); @@ -175,12 +175,12 @@ describe('Edit task filters cloud', () => { await tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().clickOnSaveButton(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('New'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Priority'); await tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); await tasksCloudDemoPage.customTaskFilter('custom-new').clickTaskFilter(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); }); @@ -189,7 +189,7 @@ describe('Edit task filters cloud', () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); const editTaskFilterCloudComponent = tasksCloudDemoPage.editTaskFilterCloudComponent(); - await editTaskFilterCloudComponent.clickCustomiseFilterHeader(); + await editTaskFilterCloudComponent.openFilter(); await editTaskFilterCloudComponent.setSortFilterDropDown('Id'); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); @@ -200,11 +200,11 @@ describe('Edit task filters cloud', () => { await editTaskFilterDialog.clickOnSaveButton(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('New'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('Name'); await tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveButton(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('New'); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name'); @@ -215,7 +215,7 @@ describe('Edit task filters cloud', () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); const editTaskFilterCloudComponent = tasksCloudDemoPage.editTaskFilterCloudComponent(); - await editTaskFilterCloudComponent.clickCustomiseFilterHeader(); + await editTaskFilterCloudComponent.openFilter(); await editTaskFilterCloudComponent.setSortFilterDropDown('Id'); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); @@ -226,7 +226,7 @@ describe('Edit task filters cloud', () => { await editTaskFilterDialog.clickOnSaveButton(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('New'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); @@ -238,7 +238,7 @@ describe('Edit task filters cloud', () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); const editTaskFilterCloudComponent = tasksCloudDemoPage.editTaskFilterCloudComponent(); - await editTaskFilterCloudComponent.clickCustomiseFilterHeader(); + await editTaskFilterCloudComponent.openFilter(); await editTaskFilterCloudComponent.setSortFilterDropDown('Priority'); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Priority'); @@ -251,17 +251,17 @@ describe('Edit task filters cloud', () => { await expect(await tasksCloudDemoPage.getActiveFilterName()).toEqual('My Tasks'); await tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('CreatedDate'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); }); it('[C291801] Save button of task filter dialog should be disabled when task name is empty', async () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); const editTaskFilterCloudComponent = tasksCloudDemoPage.editTaskFilterCloudComponent(); - await editTaskFilterCloudComponent.clickCustomiseFilterHeader(); + await editTaskFilterCloudComponent.openFilter(); await editTaskFilterCloudComponent.setSortFilterDropDown('Id'); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); @@ -282,7 +282,7 @@ describe('Edit task filters cloud', () => { it('[C291799] Task filter dialog is displayed when clicking on Save As button', async () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); const tasksCloud = tasksCloudDemoPage.editTaskFilterCloudComponent(); - await tasksCloud.clickCustomiseFilterHeader(); + await tasksCloud.openFilter(); await tasksCloud.setSortFilterDropDown('Id'); await expect(await tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); await tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index 9ef9d16628..c0b0fda319 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -132,7 +132,7 @@ describe('Process list cloud', () => { it('[C290069] Should display processes ordered by name when Name is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('RUNNING'); await editProcessFilterCloudComponent.setSortFilterDropDown('Name'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -147,7 +147,7 @@ describe('Process list cloud', () => { it('[C291783] Should display processes ordered by id when Id is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('RUNNING'); await editProcessFilterCloudComponent.setSortFilterDropDown('Id'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -161,7 +161,7 @@ describe('Process list cloud', () => { it('[C305054] Should display processes ordered by status when Status is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('ALL'); await editProcessFilterCloudComponent.setSortFilterDropDown('Status'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -174,7 +174,7 @@ describe('Process list cloud', () => { it('[C305054] Should display processes ordered by initiator when Initiator is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('ALL'); await editProcessFilterCloudComponent.setSortFilterDropDown('Initiator'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -187,7 +187,7 @@ describe('Process list cloud', () => { it('[C305054] Should display processes ordered by processdefinitionid date when ProcessDefinitionId is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('ALL'); await editProcessFilterCloudComponent.setSortFilterDropDown('ProcessDefinitionId'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -200,7 +200,7 @@ describe('Process list cloud', () => { it('[C305054] Should display processes ordered by processdefinitionkey date when ProcessDefinitionKey is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('ALL'); await editProcessFilterCloudComponent.setSortFilterDropDown('ProcessDefinitionKey'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -213,7 +213,7 @@ describe('Process list cloud', () => { it('[C305054] Should display processes ordered by last modified date when Last Modified is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('ALL'); await editProcessFilterCloudComponent.setSortFilterDropDown('LastModified'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -226,7 +226,7 @@ describe('Process list cloud', () => { it('[C305054] Should display processes ordered by business key date when BusinessKey is selected from sort dropdown', async () => { const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); - await editProcessFilterCloudComponent.clickCustomiseFilterHeader(); + await editProcessFilterCloudComponent.openFilter(); await editProcessFilterCloudComponent.setStatusFilterDropDown('ALL'); await editProcessFilterCloudComponent.setSortFilterDropDown('BusinessKey'); await editProcessFilterCloudComponent.setOrderFilterDropDown('ASC'); @@ -241,7 +241,7 @@ describe('Process list cloud', () => { await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('All Processes'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); const editProcessFilterCloudComponent = processCloudDemoPage.editProcessFilterCloudComponent(); @@ -251,7 +251,7 @@ describe('Process list cloud', () => { }); it('[C297697] The value of the filter should be preserved when saving it', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProcessInstanceId(completedProcess.entry.id); await processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); @@ -263,13 +263,13 @@ describe('Process list cloud', () => { await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(completedProcess.entry.id); await expect(await processCloudDemoPage.processListCloudComponent().getDataTable().numberOfRows()).toBe(1); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getProcessInstanceId()).toEqual(completedProcess.entry.id); }); it('[C297646] Should display the filter dropdown fine , after switching between saved filters', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); noOfApps = await processCloudDemoPage.editProcessFilterCloudComponent().getNumberOfAppNameOptions(); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkAppNamesAreUnique()).toBe(true); @@ -288,7 +288,7 @@ describe('Process list cloud', () => { await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnSaveButton(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('SavedFilter'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getProcessInstanceId()).toEqual(runningProcessInstance.entry.id); await processCloudDemoPage.editProcessFilterCloudComponent().setStatusFilterDropDown('RUNNING'); @@ -301,7 +301,7 @@ describe('Process list cloud', () => { await processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnSaveButton(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('SwitchFilter'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getProcessInstanceId()).toEqual(switchProcessInstance.entry.id); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().getNumberOfAppNameOptions()).toBe(noOfApps); await expect(await processCloudDemoPage.editProcessFilterCloudComponent().checkAppNamesAreUnique()).toBe(true); @@ -329,7 +329,7 @@ describe('Process list cloud', () => { await processCloudDemoPage.allProcessesFilter().clickProcessFilter(); await processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('All Processes'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsDisplayed(); await processCloudDemoPage.editProcessFilterCloudComponent().checkSaveAsButtonIsDisplayed(); await processCloudDemoPage.editProcessFilterCloudComponent().checkDeleteButtonIsNotDisplayed(); diff --git a/e2e/process-services-cloud/process-filter-results.e2e.ts b/e2e/process-services-cloud/process-filter-results.e2e.ts index 9ac309813d..83a08b11e0 100644 --- a/e2e/process-services-cloud/process-filter-results.e2e.ts +++ b/e2e/process-services-cloud/process-filter-results.e2e.ts @@ -156,7 +156,7 @@ describe('Process filters cloud', () => { }); it('[C306887] Should be able to filter by appName', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setAppNameDropDown(candidateBaseApp); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('initiator', testUser.username); @@ -166,7 +166,7 @@ describe('Process filters cloud', () => { }); it('[C306889] Should be able to see "No process found" when using an app with no processes in the appName field', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setAppNameDropDown('subprocessapp'); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('initiator', testUser.username); @@ -175,7 +175,7 @@ describe('Process filters cloud', () => { }); it('[C306890] Should be able to filter by initiator', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('initiator', testUser.username); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); @@ -184,7 +184,7 @@ describe('Process filters cloud', () => { }); it('[C306891] Should be able to see "No process found" when providing an initiator whitout processes', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('initiator', anotherUser.username); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); @@ -192,7 +192,7 @@ describe('Process filters cloud', () => { }); it('[C311315] Should be able to filter by process definition id', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('processDefinitionId', processDefinition.entry.id); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); @@ -205,7 +205,7 @@ describe('Process filters cloud', () => { }); it('[C311316] Should be able to filter by process definition key', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('processDefinitionKey', processDefinition.entry.key); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); @@ -217,7 +217,7 @@ describe('Process filters cloud', () => { }); it('[C311317] Should be able to filter by process instance id', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('processInstanceId', runningProcessInstance.entry.id); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); @@ -233,7 +233,7 @@ describe('Process filters cloud', () => { }); it('[C311321] Should be able to filter by process name', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('processName', runningProcessInstance.entry.name); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); @@ -245,7 +245,7 @@ describe('Process filters cloud', () => { }); it('[C306892] Should be able to filter by process status - Running', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setStatusFilterDropDown('RUNNING'); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); @@ -255,7 +255,7 @@ describe('Process filters cloud', () => { }); it('[C306892] Should be able to filter by process status - Completed', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setStatusFilterDropDown('COMPLETED'); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(completedProcess.entry.name); @@ -265,7 +265,7 @@ describe('Process filters cloud', () => { }); it('[C306892] Should be able to filter by process status - Suspended', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setStatusFilterDropDown('SUSPENDED'); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); @@ -276,7 +276,7 @@ describe('Process filters cloud', () => { }); it('[C306892] Should be able to filter by process status - All', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setStatusFilterDropDown('ALL'); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); @@ -286,49 +286,49 @@ describe('Process filters cloud', () => { }); it('[C311318] Should be able to filter by lastModifiedFrom - displays record when date = currentDate', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedFrom', currentDate); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); }); it('[C311318] Should be able to filter by lastModifiedFrom - displays record when date = beforeDate', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedFrom', beforeDate); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); }); it('[C311318] Should be able to filter by lastModifiedFrom - does not display record when date = afterDate', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedFrom', afterDate); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsNotDisplayedByName(runningProcessInstance.entry.name); }); it('[C311319] Should be able to filter by lastModifiedTo - displays record when date = currentDate', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedTo', currentDate); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); }); it('[C311319] Should be able to filter by lastModifiedTo - does not display record when date = beforeDate', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedTo', beforeDate); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsNotDisplayedByName(runningProcessInstance.entry.name); }); it('[C311319] Should be able to filter by lastModifiedTo - displays record when date = afterDate', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedTo', afterDate); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); await processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedByName(runningProcessInstance.entry.name); }); it('[C311319] Should not display any processes when the lastModifiedFrom and lastModifiedTo are set to a future date', async () => { - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedFrom', afterDate); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('lastModifiedTo', afterDate); await processCloudDemoPage.processListCloudComponent().getDataTable().waitTillContentLoaded(); diff --git a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts index 8c886264fd..7ba6e5d2b6 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts @@ -272,7 +272,7 @@ describe('Start Task Form', () => { await startProcessPage.clickStartProcessButton(); await processCloudDemoPage.runningProcessesFilter().clickProcessFilter(); await expect(await processCloudDemoPage.getActiveFilterName()).toBe('Running Processes'); - await processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); + await processCloudDemoPage.editProcessFilterCloudComponent().openFilter(); await processCloudDemoPage.editProcessFilterCloudComponent().setProperty('processName', startEventFormProcess); await browser.sleep(1000); 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 8d2d0216e3..5d7fc81060 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 @@ -118,7 +118,7 @@ describe('Start Task', () => { await startTask.addName(unassignedTaskName); await startTask.clickStartButton(); await tasksCloudDemoPage.editTaskFilterCloudComponent(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CREATED'); await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitForTableBody(); @@ -138,7 +138,7 @@ describe('Start Task', () => { await startTask.checkStartButtonIsEnabled(); await startTask.clickStartButton(); await tasksCloudDemoPage.editTaskFilterCloudComponent(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CREATED'); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(unassignedTaskName); @@ -226,7 +226,7 @@ describe('Start Task', () => { await peopleCloudComponent.selectAssigneeFromList(`${apsUser.firstName} ${apsUser.lastName}`); await startTask.clickStartButton(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('ALL'); 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 7b826863d0..f81f944834 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 @@ -139,7 +139,7 @@ describe('Start Task - Group Cloud Component', () => { await appListCloudComponent.goToApp(simpleApp); await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitForTableBody(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CREATED'); @@ -171,7 +171,7 @@ describe('Start Task - Group Cloud Component', () => { await appListCloudComponent.goToApp(simpleApp); await tasksCloudDemoPage.taskListCloudComponent().getDataTable().waitForTableBody(); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CREATED'); diff --git a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts index 7a7f722c59..f1934d4bd7 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts @@ -136,7 +136,7 @@ describe('Task form cloud component', () => { await appListCloudComponent.goToApp(simpleApp); await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); await expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CREATED'); @@ -237,7 +237,7 @@ describe('Task form cloud component', () => { it('[C307095] Task can not be completed by owner user', async () => { await tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); await expect(await tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await browser.driver.sleep(1000); diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 3bd9e34cd8..663f2a4ed7 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -152,7 +152,7 @@ describe('Edit task filters and task list properties', () => { await navigationBarPage.navigateToProcessServicesCloudPage(); await appListCloudComponent.checkApsContainer(); await appListCloudComponent.goToApp(simpleApp); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); }); @@ -381,7 +381,7 @@ describe('Edit task filters and task list properties', () => { await navigationBarPage.navigateToProcessServicesCloudPage(); await appListCloudComponent.checkApsContainer(); await appListCloudComponent.goToApp(simpleApp); - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); }); diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index b689817bee..4546577e51 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -122,7 +122,7 @@ describe('Task filters cloud', () => { }); it('[C290045] Should display only tasks with Assigned status when Assigned is selected from status dropdown', async () => { - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('ASSIGNED'); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(assignedTaskName); @@ -132,7 +132,7 @@ describe('Task filters cloud', () => { }); it('[C290061] Should display only tasks with Completed status when Completed is selected from status dropdown', async () => { - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('COMPLETED'); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(completedTaskName); @@ -142,7 +142,7 @@ describe('Task filters cloud', () => { }); it('[C290139] Should display only tasks with all statuses when All is selected from status dropdown', async () => { - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('ALL'); @@ -153,7 +153,7 @@ describe('Task filters cloud', () => { }); it('[C290060] Should display only tasks with Created status when Created is selected from status dropdown', async () => { - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CREATED'); @@ -164,7 +164,7 @@ describe('Task filters cloud', () => { }); it('[C290155] Should display only tasks with Cancelled status when Cancelled is selected from status dropdown', async () => { - await tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); + await tasksCloudDemoPage.editTaskFilterCloudComponent().openFilter(); await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee(); await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('CANCELLED'); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(deletedTaskName); diff --git a/lib/testing/src/lib/core/utils/browser-actions.ts b/lib/testing/src/lib/core/utils/browser-actions.ts index 8fc4814836..e6b3fd42a1 100644 --- a/lib/testing/src/lib/core/utils/browser-actions.ts +++ b/lib/testing/src/lib/core/utils/browser-actions.ts @@ -21,9 +21,18 @@ import { BrowserVisibility } from '../utils/browser-visibility'; export class BrowserActions { static async click(elementFinder: ElementFinder): Promise { - await BrowserVisibility.waitUntilElementIsVisible(elementFinder); - await BrowserVisibility.waitUntilElementIsClickable(elementFinder); - await elementFinder.click(); + try { + await BrowserVisibility.waitUntilElementIsVisible(elementFinder); + await BrowserVisibility.waitUntilElementIsClickable(elementFinder); + await elementFinder.click(); + } catch (clickErr) { + try { + await browser.executeScript(`arguments[0].scrollIntoView();`, elementFinder); + await browser.executeScript(`arguments[0].click();`, elementFinder); + } catch (jsErr) { + throw jsErr; + } + } } static async waitUntilActionMenuIsVisible(): Promise { diff --git a/lib/testing/src/lib/core/utils/browser-visibility.ts b/lib/testing/src/lib/core/utils/browser-visibility.ts index 5ec86cf688..dee2a1cf24 100644 --- a/lib/testing/src/lib/core/utils/browser-visibility.ts +++ b/lib/testing/src/lib/core/utils/browser-visibility.ts @@ -26,7 +26,7 @@ export class BrowserVisibility { return browser.wait(until.presenceOf(elementToCheck), waitTimeout, 'Element is not present ' + elementToCheck.locator()); } /* - * Wait for element is visible + * Wait for element to be visible */ static async waitUntilElementIsVisible(elementToCheck: ElementFinder, waitTimeout: number = DEFAULT_TIMEOUT, message: string = 'Element is not visible'): Promise { return browser.wait(until.visibilityOf(elementToCheck), waitTimeout, message + elementToCheck.locator()); diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts index f519714727..1ababb9d48 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts @@ -27,6 +27,7 @@ export class EditProcessFilterCloudComponentPage { saveButton: ElementFinder = element(by.css('button[data-automation-id="adf-filter-action-save"]')); saveAsButton: ElementFinder = element(by.css('button[data-automation-id="adf-filter-action-saveAs"]')); deleteButton: ElementFinder = element(by.css('button[data-automation-id="adf-filter-action-delete"]')); + filter: ElementFinder = element(by.css(`adf-cloud-edit-process-filter mat-expansion-panel-header`)); editProcessFilterDialogPage = new EditProcessFilterDialogPage(); @@ -34,7 +35,11 @@ export class EditProcessFilterCloudComponentPage { return this.editProcessFilterDialogPage; } - async clickCustomiseFilterHeader(): Promise { + async isFilterDisplayed(): Promise { + return await BrowserVisibility.waitUntilElementIsVisible(this.filter); + } + + async openFilter(): Promise { await BrowserActions.click(this.customiseFilter); await browser.driver.sleep(1000); } @@ -93,6 +98,11 @@ export class EditProcessFilterCloudComponentPage { await BrowserActions.click(appNameElement); } + async getApplicationSelected(): Promise { + const applicationDropdown = element(by.css(`[data-automation-id='adf-cloud-edit-process-property-appName']`)); + return await applicationDropdown.getText(); + } + async checkAppNamesAreUnique(): Promise { const appNameList = element.all(by.css('mat-option[data-automation-id="adf-cloud-edit-process-property-optionsappName"] span')); const appTextList: any = await appNameList.getText(); @@ -109,6 +119,11 @@ export class EditProcessFilterCloudComponentPage { return dropdownOptions.count(); } + async isApplicationListLoaded(): Promise { + const emptyList = element(by.css(`[data-automation-id='adf-cloud-edit-process-property-appName'] .mat-select-placeholder`)); + return await BrowserVisibility.waitUntilElementIsNotVisible(emptyList); + } + async setProcessInstanceId(option): Promise { await this.setProperty('processInstanceId', option); } diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts index 64e72bb88d..9d80bc4732 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts @@ -38,6 +38,7 @@ export class EditTaskFilterCloudComponentPage { saveButton: ElementFinder = element(by.css('[data-automation-id="adf-filter-action-save"]')); saveAsButton: ElementFinder = element(by.css('[data-automation-id="adf-filter-action-saveAs"]')); deleteButton: ElementFinder = element(by.css('[data-automation-id="adf-filter-action-delete"]')); + filter: ElementFinder = element(by.css(`adf-cloud-edit-task-filter mat-expansion-panel-header`)); editTaskFilterDialogPage = new EditTaskFilterDialogPage(); @@ -45,7 +46,11 @@ export class EditTaskFilterCloudComponentPage { return this.editTaskFilterDialogPage; } - async clickCustomiseFilterHeader(): Promise { + async isFilterDisplayed(): Promise { + return await BrowserVisibility.waitUntilElementIsVisible(this.filter); + } + + async openFilter(): Promise { await BrowserActions.click(this.customiseFilter); await browser.driver.sleep(1000); }