From 80aaaef65d0905b4531c3c8585714644b0556cc7 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 26 Mar 2019 18:05:06 +0000 Subject: [PATCH] fix part PS Cloud e2e --- .../editProcessFilterCloudComponent.ts | 10 ++-- .../edit-process-filters-component.e2e.ts | 46 +++++++++---------- .../edit-task-filters-component.e2e.ts | 40 ++++++++-------- .../process-custom-filters.e2e.ts | 4 +- .../task-list-properties.e2e.ts | 8 ++-- .../tasks-custom-filters.e2e.ts | 4 +- 6 files changed, 56 insertions(+), 56 deletions(-) diff --git a/e2e/pages/adf/process-cloud/editProcessFilterCloudComponent.ts b/e2e/pages/adf/process-cloud/editProcessFilterCloudComponent.ts index e15184f829..3a081692f7 100644 --- a/e2e/pages/adf/process-cloud/editProcessFilterCloudComponent.ts +++ b/e2e/pages/adf/process-cloud/editProcessFilterCloudComponent.ts @@ -22,9 +22,9 @@ export class EditProcessFilterCloudComponent { customiseFilter = element(by.id('adf-edit-process-filter-title-id')); selectedOption = element.all(by.css('mat-option[class*="mat-selected"]')).first(); - saveButton = element(by.css('button[id="adf-save-id"]')); - saveAsButton = element(by.css('button[id="adf-save-as-id"]')); - deleteButton = element(by.css('button[id="adf-delete-id"]')); + saveButton = element(by.css('button[data-automation-id="adf-filter-action-save"]')); + saveAsButton = element(by.css('button[data-automation-id="adf-filter-action-saveAs"]')); + deleteButton = element(by.css('button[data-automation-id="adf-filter-action-delete"]')); editProcessFilter = new EditProcessFilterDialog(); @@ -178,7 +178,7 @@ export class EditProcessFilterCloudComponent { } clickSaveAsButton() { - let disabledButton = element(by.css(("button[id='adf-save-as-id'][disabled]"))); + let disabledButton = element(by.css(("button[data-automation-id='adf-filter-action-saveAs'][disabled]"))); Util.waitUntilElementIsClickable(this.saveAsButton); Util.waitUntilElementIsVisible(this.saveAsButton); Util.waitUntilElementIsNotVisible(disabledButton); @@ -193,7 +193,7 @@ export class EditProcessFilterCloudComponent { } clickSaveButton() { - let disabledButton = element(by.css(("button[id='adf-save-as-id'][disabled]"))); + let disabledButton = element(by.css(("button[data-automation-id='adf-filter-action-saveAs'][disabled]"))); Util.waitUntilElementIsClickable(this.saveButton); Util.waitUntilElementIsVisible(this.saveButton); Util.waitUntilElementIsNotVisible(disabledButton); 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 1c0872750c..f87cdc78c5 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -76,7 +76,7 @@ describe('Edit process filters cloud', () => { it('[C291805] New process filter is added when clicking Save As button', () => { processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('ID'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); @@ -85,67 +85,67 @@ describe('Edit process filters cloud', () => { expect(processCloudDemoPage.getActiveFilterName()).toBe('New'); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); expect(processCloudDemoPage.editProcessFilterCloudComponent().checkSaveButtonIsEnabled()).toEqual(false); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); expect(processCloudDemoPage.editProcessFilterCloudComponent().checkSaveAsButtonIsEnabled()).toEqual(false); expect(processCloudDemoPage.editProcessFilterCloudComponent().checkDeleteButtonIsEnabled()).toEqual(true); processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('START DATE'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate'); processCloudDemoPage.customProcessFilter('custom-new').clickProcessFilter(); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton(); }); it('[C291806] Two process filters with same name can be created when clicking the Save As button', () => { processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('ID'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('New').clickOnSaveButton(); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded(); expect(processCloudDemoPage.getActiveFilterName()).toBe('New'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('NAME'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('NAME'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Name'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name'); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton().setFilterName('New').clickOnSaveButton(); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded(); expect(processCloudDemoPage.getActiveFilterName()).toBe('New'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('NAME'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name'); processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton(); processCloudDemoPage.customProcessFilter('custom-new').clickProcessFilter(); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded(); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton(); }); it('[C291807] A process filter is overrided when clicking on save button', () => { processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('ID'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('New').clickOnSaveButton(); expect(processCloudDemoPage.getActiveFilterName()).toBe('New'); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded(); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('NAME'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('NAME'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Name'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name'); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveButton(); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded(); expect(processCloudDemoPage.getActiveFilterName()).toBe('New'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('NAME'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name'); processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton(); }); it('[C291808] A process filter is deleted when clicking on delete button', () => { processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('ID'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('New').clickOnSaveButton(); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); expect(processCloudDemoPage.getActiveFilterName()).toBe('New'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); processCloudDemoPage.editProcessFilterCloudComponent().clickDeleteButton(); expect(processCloudDemoPage.getActiveFilterName()).toBe('All Processes'); processCloudDemoPage.customProcessFilter('New').checkProcessFilterNotDisplayed(); @@ -154,7 +154,7 @@ describe('Edit process filters cloud', () => { it('[C291810] Process filter should not be created when process filter dialog is closed', () => { processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('ID'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('Cancel'); @@ -167,14 +167,14 @@ describe('Edit process filters cloud', () => { processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); processCloudDemoPage.allProcessesFilter().clickProcessFilter(); expect(processCloudDemoPage.getActiveFilterName()).toEqual('All Processes'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('START DATE'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate'); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); }); it('[C291811] Save button of process filter dialog should be disabled when process name is empty', () => { processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('ID'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Id'); processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clearFilterName(); @@ -184,15 +184,15 @@ describe('Edit process filters cloud', () => { processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().clickOnCancelButton(); processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().checkCustomiseFilterHeaderIsExpanded(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('START DATE'); - expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('START DATE'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('StartDate'); + expect(processCloudDemoPage.editProcessFilterCloudComponent().getSortFilterDropDownValue()).toEqual('StartDate'); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveButton(); }); it('[C291809] Process filter dialog is displayed when clicking on Save As button', () => { processCloudDemoPage.allProcessesFilter().clickProcessFilter(); - processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('NAME'); + processCloudDemoPage.editProcessFilterCloudComponent().setSortFilterDropDown('Name'); processCloudDemoPage.allProcessesFilter().checkProcessFilterIsDisplayed(); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); expect(processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().checkCancelButtonIsEnabled()).toEqual(true); 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 f0d95007b6..efcf177f36 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts @@ -72,7 +72,7 @@ describe('Edit task filters cloud', () => { tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getStatusFilterDropDownValue()).toEqual('ASSIGNED'); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Created Date'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('CreatedDate'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getOrderFilterDropDownValue()).toEqual('DESC'); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(assignedTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(completedTaskName); @@ -80,7 +80,7 @@ describe('Edit task filters cloud', () => { tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('Completed Tasks'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getStatusFilterDropDownValue()).toEqual('COMPLETED'); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Created Date'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('CreatedDate'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getOrderFilterDropDownValue()).toEqual('DESC'); tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(assignedTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(completedTaskName); @@ -102,7 +102,7 @@ describe('Edit task filters cloud', () => { it('[C291795] New filter is added when clicking Save As button', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('ID'); + tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Id'); tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); @@ -111,26 +111,26 @@ describe('Edit task filters cloud', () => { expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().checkSaveButtonIsEnabled()).toEqual(false); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().checkSaveAsButtonIsEnabled()).toEqual(false); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().checkDeleteButtonIsEnabled()).toEqual(true); tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Created Date'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('CreatedDate'); tasksCloudDemoPage.customTaskFilter('custom-new').clickTaskFilter(); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); }); it('[C291796] Two filters with same name can be created when clicking the Save As button', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('ID'); + tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Id'); tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('New').clickOnSaveButton(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('PRIORITY'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('New').clickOnSaveButton(); @@ -141,36 +141,36 @@ describe('Edit task filters cloud', () => { tasksCloudDemoPage.customTaskFilter('custom-new').clickTaskFilter(); tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); }); it('[C291797] A filter is overrided when clicking on save button', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('ID'); + tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Id'); tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('New').clickOnSaveButton(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); - tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('NAME'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); + tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('Name'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New'); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('NAME'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Name'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); }); it('[C291798] A filter is deleted when clicking on delete button', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('ID'); + tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Id'); tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('New').clickOnSaveButton(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); tasksCloudDemoPage.customTaskFilter('New').checkTaskFilterNotDisplayed(); @@ -191,14 +191,14 @@ describe('Edit task filters cloud', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Created Date'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('CreatedDate'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); }); it('[C291801] Save button of task filter dialog should be disabled when task name is empty', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('ID'); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Id'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().getFilterName()).toEqual('My Tasks'); tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().clearFilterName(); @@ -210,8 +210,8 @@ describe('Edit task filters cloud', () => { it('[C291799] Task filter dialog is displayed when clicking on Save As button', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('ID'); - expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('ID'); + tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Id'); + expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().checkSaveButtonIsEnabled()).toEqual(true); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().checkCancelButtonIsEnabled()).toEqual(true); diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index e097626834..ae48e12fc0 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -95,7 +95,7 @@ describe('Process list cloud', () => { it('[C290069] Should display processes ordered by name when Name is selected from sort dropdown', async() => { processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('RUNNING') - .setSortFilterDropDown('NAME').setOrderFilterDropDown('ASC'); + .setSortFilterDropDown('Name').setOrderFilterDropDown('ASC'); processCloudDemoPage.processListCloudComponent().getAllRowsNameColumn().then(function (list) { let initialList = list.slice(0); list.sort(); @@ -113,7 +113,7 @@ describe('Process list cloud', () => { it('[C291783] Should display processes ordered by id when Id is selected from sort dropdown', async() => { processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('RUNNING') - .setSortFilterDropDown('ID').setOrderFilterDropDown('ASC'); + .setSortFilterDropDown('Id').setOrderFilterDropDown('ASC'); processCloudDemoPage.processListCloudComponent().getDataTable().checkSpinnerIsDisplayed().checkSpinnerIsNotDisplayed(); processCloudDemoPage.getAllRowsByIdColumn().then(function (list) { let initialList = list.slice(0); diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 7fa63c439e..3428bc06b7 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -242,7 +242,7 @@ describe('Edit task filters and task list properties', () => { expect(tasksCloudDemoPage.taskListCloudComponent().getNoTasksFoundMessage()).toEqual(noTasksFoundMessage); }); - it('[C297484] Task is displayed when typing into lastModifiedFrom field a date before the task created date', function () { + it('[C297484] Task is displayed when typing into lastModifiedFrom field a date before the task CreatedDate', function () { tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); @@ -253,7 +253,7 @@ describe('Edit task filters and task list properties', () => { tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(createdTask.entry.name); }); - it('[C297689] Task is not displayed when typing into lastModifiedFrom field the same date as tasks created date', function () { + it('[C297689] Task is not displayed when typing into lastModifiedFrom field the same date as tasks CreatedDate', function () { tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); @@ -261,7 +261,7 @@ describe('Edit task filters and task list properties', () => { tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(createdTask.entry.name); }); - it('[C297485] Task is displayed when typing into lastModifiedTo field a date after the task created date', function () { + it('[C297485] Task is displayed when typing into lastModifiedTo field a date after the task CreatedDate', function () { tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); @@ -272,7 +272,7 @@ describe('Edit task filters and task list properties', () => { tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(createdTask.entry.name); }); - it('[C297690] Task is not displayed when typing into lastModifiedTo field the same date as tasks created date', function () { + it('[C297690] Task is not displayed when typing into lastModifiedTo field the same date as tasks CreatedDate', function () { tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index e03f97f059..acdda666c3 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -143,7 +143,7 @@ describe('Task filters cloud', () => { it('[C290069] Should display tasks ordered by name when Name is selected from sort dropdown', () => { tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ASSIGNED') - .setSortFilterDropDown('NAME').setOrderFilterDropDown('ASC'); + .setSortFilterDropDown('Name').setOrderFilterDropDown('ASC'); tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsDisplayed(); tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed(); tasksCloudDemoPage.taskListCloudComponent().getAllRowsNameColumn().then( (list) => { @@ -169,7 +169,7 @@ describe('Task filters cloud', () => { it('[C290156] Should display tasks ordered by id when Id is selected from sort dropdown', () => { tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setStatusFilterDropDown('ASSIGNED') - .setSortFilterDropDown('ID').setOrderFilterDropDown('ASC'); + .setSortFilterDropDown('Id').setOrderFilterDropDown('ASC'); tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsDisplayed(); tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed();