From 536467f0ee9c71f9711e77703de5bb541e6117db Mon Sep 17 00:00:00 2001 From: cristinaj Date: Fri, 9 Nov 2018 12:17:53 +0200 Subject: [PATCH] Refactor tasksListPage (#3952) --- .../datatable/data-table-component.e2e.ts | 6 +- e2e/pages/adf/dataTablePage.js | 75 +++++++++++++++---- .../adf/process_services/tasksListPage.js | 53 +------------ e2e/pages/adf/process_services/tasksPage.ts | 13 +++- .../Task_details_no_form.e2e.ts | 4 +- .../attach-file-widget.e2e.ts | 2 +- .../attach_form_component.e2e.ts | 8 +- .../checklist_component.e2e.ts | 36 ++++----- .../comment_component_tasks.e2e.ts | 6 +- .../form_widgets_component.e2e.ts | 2 +- .../pagination_tasklist_addingTasks.e2e.ts | 4 +- e2e/process-services/people_component.e2e.ts | 24 +++--- .../sort_tasklist_pagination.e2e.ts | 6 +- e2e/process-services/standalone_task.e2e.ts | 12 +-- .../start_task_custom_app.e2e.ts | 20 ++--- .../start_task_task_app.e2e.ts | 16 ++-- e2e/process-services/task-audit.e2e.ts | 12 +-- .../task_attachmentList_actionMenu.e2e.ts | 8 +- e2e/process-services/task_details.e2e.ts | 24 +++--- e2e/process-services/task_details_form.e2e.ts | 8 +- .../task_filters_component.e2e.ts | 42 +++++------ .../task_filters_sorting.e2e.ts | 48 ++++++------ .../task_list_pagination.e2e.ts | 32 ++++---- 23 files changed, 232 insertions(+), 229 deletions(-) diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index c41fe86c07..76fc478212 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -63,11 +63,11 @@ describe('Datatable component', () => { }); it('[C277314] Should filter the table rows when the input filter is passed', () => { - expect(dataTablePage.getNumberOfRows()).toEqual(5); - dataTablePage.insertFilter('Name'); expect(dataTablePage.getNumberOfRows()).toEqual(4); + dataTablePage.insertFilter('Name'); + expect(dataTablePage.getNumberOfRows()).toEqual(3); dataTablePage.insertFilter('I'); - expect(dataTablePage.getNumberOfRows()).toEqual(2); + expect(dataTablePage.getNumberOfRows()).toEqual(1); }); }); diff --git a/e2e/pages/adf/dataTablePage.js b/e2e/pages/adf/dataTablePage.js index 18c7a2ad04..b8f0f1f20e 100644 --- a/e2e/pages/adf/dataTablePage.js +++ b/e2e/pages/adf/dataTablePage.js @@ -18,24 +18,27 @@ var TestConfig = require('../../test.config'); var Util = require('../../util/util'); -var DataTablePage = function () { +var DataTablePage = function (rootElement = element(by.css("adf-datatable"))) { var dataTableURL = TestConfig.adf.url + TestConfig.adf.port + "/datatable"; + + var contents = element.all(by.css('div[class="adf-datatable-body"] span')); var multiSelect = element(by.css("div[data-automation-id='multiselect'] label > div[class='mat-checkbox-inner-container']")); var selectionButton = element(by.css("div[class='mat-select-arrow']")); var selectionDropDown = element(by.css("div[class*='ng-trigger-transformPanel']")); var allSelectedRows = element.all(by.css("div[class*='is-selected']")); var selectedRowNumber = element(by.css("div[class*='is-selected'] div[data-automation-id*='text_']")); var selectAll = element(by.css("div[class*='header'] label")); - var list = element.all(by.css("div[class*=adf-datatable-row]")); + var list = rootElement.all(by.css("div[class*=adf-datatable-body] div[class*=adf-datatable-row]")); var addRow = element(by.xpath("//span[contains(text(),'Add row')]/..")); var replaceRows = element(by.xpath("//span[contains(text(),'Replace rows')]/..")); var reset = element(by.xpath("//span[contains(text(),'Reset to default')]/..")); var replaceColumns = element(by.xpath("//span[contains(text(),'Replace columns')]/..")); - var loadNode = element(by.xpath("//span[contains(text(),'Load Node')]/..")); var createdOnColumn = element(by.css("div[data-automation-id='auto_id_createdOn']")); var pageLoaded = element(by.css("div[data-automation-id='auto_id_id']")); - var tableBody = element.all(by.css("adf-document-list div[class='adf-datatable-body']")).first(); + var tableBody = element.all(by.css("div[class='adf-datatable-body']")).first(); + var spinner = element(by.css('mat-progress-spinner')); + this.goToDatatable = function () { browser.driver.get(dataTableURL); @@ -217,18 +220,6 @@ var DataTablePage = function () { Util.waitUntilElementIsNotOnPage(createdOnColumn); }; - /** - * check the nodeID is the same with the userHome folder's ID - * @method replaceColumns - */ - this.checkLoadNode = function (userHome) { - var nodeId = element(by.css("div[data-automation-id*='" + userHome + "']")); - - Util.waitUntilElementIsVisible(loadNode); - loadNode.click(); - Util.waitUntilElementIsVisible(nodeId, 10000); - }; - this.getRowsName = function (content) { var row = element(by.css("div[data-automation-id*='" + content + "']")); Util.waitUntilElementIsPresent(row); @@ -251,10 +242,62 @@ var DataTablePage = function () { return inputFilter.sendKeys(filterText); }; + this.getNodeIdFirstElement = function () { let firstNode = element.all(by.css('adf-datatable div[title="Node id"] span')).first(); return firstNode.getText(); }; + this.sortByColumn = function (sortOrder, locator) { + Util.waitUntilElementIsVisible(element(locator)); + return element(locator).getAttribute('class').then(function (result) { + if (sortOrder === true) { + if (!result.includes('sorted-asc')) { + if (result.includes('sorted-desc') || result.includes('sortable')) { + element(locator).click(); + } + } + } + else { + if (result.includes('sorted-asc')) { + element(locator).click(); + } else if (result.includes('sortable')) { + element(locator).click(); + element(locator).click(); + } + } + + return Promise.resolve(); + }); + }; + + this.checkContentIsDisplayed = function(content) { + var row = by.cssContainingText("span", content); + Util.waitUntilElementIsVisible(tableBody.all(row).first()); + return this; + }; + + this.checkContentIsNotDisplayed = function(content) { + var row = by.cssContainingText("span", content); + Util.waitUntilElementIsNotOnPage(tableBody.all(row).first()); + return this; + }; + + this.selectRowByContentName = function(content) { + var row = by.cssContainingText("span", content); + Util.waitUntilElementIsVisible(tableBody.element(row)); + tableBody.element(row).click(); + return this; + }; + + this.contentInPosition = function (position){ + Util.waitUntilElementIsVisible(contents); + return contents.get(position -1).getText(); + }; + + this.checkSpinnerIsDisplayed = function () { + Util.waitUntilElementIsPresent(spinner); + }; + }; module.exports = DataTablePage; diff --git a/e2e/pages/adf/process_services/tasksListPage.js b/e2e/pages/adf/process_services/tasksListPage.js index 95c7316d44..31120c195e 100644 --- a/e2e/pages/adf/process_services/tasksListPage.js +++ b/e2e/pages/adf/process_services/tasksListPage.js @@ -16,44 +16,16 @@ */ var Util = require('../../../util/util'); +var DataTablePage = require('../dataTablePage'); var TasksListPage = function () { var taskList = element(by.css("adf-tasklist")); - var tableBody = element.all(by.css("adf-datatable div[class='adf-datatable-body']")).first(); - var sortByName = element(by.css('div[data-automation-id="auto_id_name"]')); - var firstTaskOnTaskList = element.all(by.css('div[class="adf-datatable-body"] span')).first(); - var taskOnTaskList = element.all(by.css('div[class="adf-datatable-body"] span')); - var spinner = element(by.css('mat-progress-spinner')); - this.clickSortByName = function () { - Util.waitUntilElementIsVisible(sortByName); - return sortByName.click(); - }; + var dataTable = new DataTablePage(taskList); - this.checkHighlightedTaskInTasksList = function(taskName) { - var row = by.cssContainingText('div[class="adf-datatable-row is-selected ng-star-inserted"] span', taskName); - Util.waitUntilElementIsVisible(taskList.element(row)); - return this; - }; - - this.checkTaskIsDisplayedInTasksList = function(taskName) { - var row = by.cssContainingText("span", taskName); - Util.waitUntilElementIsVisible(taskList.all(row).first()); - return this; - }; - - this.selectTaskFromTasksList = function(taskName) { - var row = by.cssContainingText("span", taskName); - Util.waitUntilElementIsVisible(taskList.element(row)); - taskList.element(row).click(); - return this; - }; - - this.checkTaskIsNotDisplayedInTasksList = function(taskName) { - var row = by.cssContainingText("span", taskName); - Util.waitUntilElementIsNotOnPage(taskList.element(row)); - return this; + this.getDataTable = function() { + return dataTable; }; this.checkTaskListIsLoaded = function () { @@ -61,23 +33,6 @@ var TasksListPage = function () { return this; }; - this.waitForTableBody = function (){ - Util.waitUntilElementIsVisible(tableBody); - }; - - this.firstTaskOnTaskList = function (){ - Util.waitUntilElementIsVisible(firstTaskOnTaskList); - return firstTaskOnTaskList.getText(); - }; - - this.taskOnTaskListInPosition = function (position){ - Util.waitUntilElementIsVisible(taskOnTaskList); - return taskOnTaskList.get(position -1).getText(); - }; - - this.checkSpinnerIsDisplayed = function () { - Util.waitUntilElementIsPresent(spinner); - }; }; module.exports = TasksListPage; diff --git a/e2e/pages/adf/process_services/tasksPage.ts b/e2e/pages/adf/process_services/tasksPage.ts index cd46558f9f..8804c5c517 100644 --- a/e2e/pages/adf/process_services/tasksPage.ts +++ b/e2e/pages/adf/process_services/tasksPage.ts @@ -38,6 +38,7 @@ export class TasksPage { checklistDialog = element(by.id('checklist-dialog')); checklistNoMessage = element(by.id('checklist-none-message')); numberOfChecklists = element(by.css('[data-automation-id="checklist-label"] mat-chip')); + sortByName = by.css('div[data-automation-id="auto_id_name"]'); createNewTask() { this.createButtonIsDisplayed(); @@ -118,10 +119,6 @@ export class TasksPage { return this; } - getAllDisplayedRows() { - return element.all(this.rows).count(); - } - completeTaskNoForm() { Util.waitUntilElementIsClickable(this.completeButtonNoForm); this.completeButtonNoForm.click(); @@ -165,4 +162,12 @@ export class TasksPage { return this; } + clickSortByNameAsc() { + return this.tasksListPage().getDataTable().sortByColumn(true, this.sortByName); + } + + clickSortByNameDesc() { + return this.tasksListPage().getDataTable().sortByColumn(false, this.sortByName); + } + } diff --git a/e2e/process-services/Task_details_no_form.e2e.ts b/e2e/process-services/Task_details_no_form.e2e.ts index fb05bc19f9..8656871eab 100644 --- a/e2e/process-services/Task_details_no_form.e2e.ts +++ b/e2e/process-services/Task_details_no_form.e2e.ts @@ -71,8 +71,8 @@ describe('Task Details - No form', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(app.taskName); - taskPage.tasksListPage().selectTaskFromTasksList(app.taskName); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(app.taskName); + taskPage.tasksListPage().getDataTable().selectRowByContentName(app.taskName); taskPage.taskDetails().noFormIsDisplayed(); taskPage.taskDetails().checkCompleteTaskButtonIsDisplayed().checkCompleteTaskButtonIsEnabled(); taskPage.taskDetails().checkAttachFormButtonIsNotDisplayed(); diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index dd88c924f0..615151838c 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -99,7 +99,7 @@ describe('Start Task - Task App', () => { viewerPage.checkFileContent('1', pdfFile.firstPageText); viewerPage.checkCloseButtonIsDisplayed(); viewerPage.clickCloseButton(); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList('View file'); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed('View file'); }); }); diff --git a/e2e/process-services/attach_form_component.e2e.ts b/e2e/process-services/attach_form_component.e2e.ts index aa68fa5e44..8e447c6b96 100644 --- a/e2e/process-services/attach_form_component.e2e.ts +++ b/e2e/process-services/attach_form_component.e2e.ts @@ -98,7 +98,7 @@ describe('Attach Form Component', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(testNames.taskName); + taskPage.tasksListPage().getDataTable().selectRowByContentName(testNames.taskName); attachFormPage.checkNoFormMessageIsDisplayed(); attachFormPage.checkAttachFormButtonIsDisplayed(); @@ -109,7 +109,7 @@ describe('Attach Form Component', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(testNames.taskName); + taskPage.tasksListPage().getDataTable().selectRowByContentName(testNames.taskName); attachFormPage.clickAttachFormButton(); attachFormPage.checkDefaultFormTitleIsDisplayed(testNames.formTitle); @@ -129,7 +129,7 @@ describe('Attach Form Component', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(testNames.taskName); + taskPage.tasksListPage().getDataTable().selectRowByContentName(testNames.taskName); attachFormPage.clickAttachFormButton(); attachFormPage.clickAttachFormDropdown(); @@ -140,7 +140,7 @@ describe('Attach Form Component', () => { formFields.completeForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(testNames.taskName); + taskPage.tasksListPage().getDataTable().selectRowByContentName(testNames.taskName); expect(formFields.getFieldValue(formTextField)).toEqual(testNames.formFieldValue); }); diff --git a/e2e/process-services/checklist_component.e2e.ts b/e2e/process-services/checklist_component.e2e.ts index a86afd3471..b1813a7991 100644 --- a/e2e/process-services/checklist_component.e2e.ts +++ b/e2e/process-services/checklist_component.e2e.ts @@ -77,7 +77,7 @@ describe('Checklist component', () => { it('[C279976] Should no checklist be created when no title is typed', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.clickOnAddChecklistButton().clickCreateChecklistButton(); taskPage.checkChecklistDialogIsNotDisplayed().checkNoChecklistIsDisplayed(); @@ -87,7 +87,7 @@ describe('Checklist component', () => { it('[C279975] Should no checklist be created when clicking on Cancel button on checklist dialog', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.clickOnAddChecklistButton().addName(checklists[0]).clickCancelButton(); taskPage.checkChecklistDialogIsNotDisplayed().checkNoChecklistIsDisplayed(); @@ -97,7 +97,7 @@ describe('Checklist component', () => { it('[C261025] Should Checklist dialog be displayed when clicking on add checklist button', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.clickOnAddChecklistButton(); taskPage.checkChecklistDialogIsDisplayed(); @@ -110,7 +110,7 @@ describe('Checklist component', () => { it('[C261026] Should Checklist number increase when a new checklist is added', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]).selectTaskFromTasksList(tasks[1]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[1]).selectRowByContentName(tasks[1]); taskPage.clickOnAddChecklistButton().addName(checklists[2]).clickCreateChecklistButton(); taskPage.checkChecklistIsDisplayed(checklists[2]); @@ -125,7 +125,7 @@ describe('Checklist component', () => { it('[C279980] Should checklist be removed when clicking on remove button', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]).selectTaskFromTasksList(tasks[2]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[2]).selectRowByContentName(tasks[2]); taskPage.clickOnAddChecklistButton().addName(removeChecklist[0]).clickCreateChecklistButton(); taskPage.clickOnAddChecklistButton().addName(removeChecklist[1]).clickCreateChecklistButton(); @@ -141,18 +141,18 @@ describe('Checklist component', () => { it('[C261027] Should not be able to remove a completed Checklist when clicking on remove button', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]).selectTaskFromTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]).selectRowByContentName(tasks[3]); taskPage.clickOnAddChecklistButton().addName(removeChecklist[2]).clickCreateChecklistButton(); taskPage.clickOnAddChecklistButton().addName(removeChecklist[3]).clickCreateChecklistButton(); taskPage.checkChecklistIsDisplayed(removeChecklist[2]); taskPage.checkChecklistIsDisplayed(removeChecklist[3]); - taskPage.tasksListPage().selectTaskFromTasksList(removeChecklist[3]); + taskPage.tasksListPage().getDataTable().selectRowByContentName(removeChecklist[3]); taskPage.completeTaskNoForm(); - taskPage.tasksListPage().checkTaskIsNotDisplayedInTasksList(removeChecklist[3]); + taskPage.tasksListPage().getDataTable().checkContentIsNotDisplayed(removeChecklist[3]); - taskPage.tasksListPage().selectTaskFromTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().selectRowByContentName(tasks[3]); taskPage.checkChecklistIsDisplayed(removeChecklist[2]); taskPage.checkChecklistIsDisplayed(removeChecklist[3]); expect(taskPage.getNumberOfChecklists()).toEqual('2'); @@ -163,28 +163,28 @@ describe('Checklist component', () => { it('[C261028] Should all checklists of a task be completed when the task is completed', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]).selectTaskFromTasksList(tasks[4]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[4]).selectRowByContentName(tasks[4]); taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[0]).clickCreateChecklistButton(); taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[1]).clickCreateChecklistButton(); - taskPage.tasksListPage().selectTaskFromTasksList(hierarchyChecklist[0]); + taskPage.tasksListPage().getDataTable().selectRowByContentName(hierarchyChecklist[0]); taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[2]).clickCreateChecklistButton(); taskPage.checkChecklistIsDisplayed(hierarchyChecklist[2]); - taskPage.tasksListPage().selectTaskFromTasksList(hierarchyChecklist[1]); + taskPage.tasksListPage().getDataTable().selectRowByContentName(hierarchyChecklist[1]); taskPage.clickOnAddChecklistButton().addName(hierarchyChecklist[3]).clickCreateChecklistButton(); taskPage.checkChecklistIsDisplayed(hierarchyChecklist[3]); - taskPage.tasksListPage().selectTaskFromTasksList(tasks[4]); + taskPage.tasksListPage().getDataTable().selectRowByContentName(tasks[4]); taskPage.completeTaskNoForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[0]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[1]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[2]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(hierarchyChecklist[3]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[4]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(hierarchyChecklist[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(hierarchyChecklist[1]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(hierarchyChecklist[2]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(hierarchyChecklist[3]); }); }); diff --git a/e2e/process-services/comment_component_tasks.e2e.ts b/e2e/process-services/comment_component_tasks.e2e.ts index 4ff71e0f7a..51e5714989 100644 --- a/e2e/process-services/comment_component_tasks.e2e.ts +++ b/e2e/process-services/comment_component_tasks.e2e.ts @@ -96,7 +96,7 @@ describe('Comment component for Processes', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskName.completed_task); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.completed_task); commentsPage.checkCommentInputIsNotDisplayed(); }); @@ -119,7 +119,7 @@ describe('Comment component for Processes', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskName.multiple_users); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.multiple_users); taskPage.taskDetails().selectActivityTab(); browser.controlFlow().execute(async() => { @@ -149,7 +149,7 @@ describe('Comment component for Processes', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskName.multiple_users); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.multiple_users); taskPage.taskDetails().selectActivityTab(); browser.controlFlow().execute(async() => { diff --git a/e2e/process-services/form_widgets_component.e2e.ts b/e2e/process-services/form_widgets_component.e2e.ts index 75b1f5c940..cb77bfd1ff 100644 --- a/e2e/process-services/form_widgets_component.e2e.ts +++ b/e2e/process-services/form_widgets_component.e2e.ts @@ -85,7 +85,7 @@ describe('Form widgets', () => { taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(newTask).addDescription('Description').addForm(app.formName).clickStartButton() .then(() => { - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(newTask); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(newTask); taskPage.formFields().checkFormIsDisplayed(); expect(taskPage.taskDetails().getTitle()).toEqual('Activities'); }) diff --git a/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts index d7d7c99418..332e34c9ab 100644 --- a/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts +++ b/e2e/process-services/pagination_tasklist_addingTasks.e2e.ts @@ -81,7 +81,7 @@ describe('Items per page set to 15 and adding of tasks', () => { expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage); expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue + ' of ' + (nrOfTasks - 5)); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fifteenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fifteenValue); browser.controlFlow().execute(async () => { for (i; i < nrOfTasks; i++) { @@ -95,7 +95,7 @@ describe('Items per page set to 15 and adding of tasks', () => { expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage); expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages); expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + nrOfTasks + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(nrOfTasks - itemsPerPage.fifteenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(nrOfTasks - itemsPerPage.fifteenValue); paginationPage.checkNextPageButtonIsDisabled(); paginationPage.checkPreviousPageButtonIsEnabled(); }); diff --git a/e2e/process-services/people_component.e2e.ts b/e2e/process-services/people_component.e2e.ts index f81fde0edb..bd9de61002 100644 --- a/e2e/process-services/people_component.e2e.ts +++ b/e2e/process-services/people_component.e2e.ts @@ -79,7 +79,7 @@ describe('People component', () => { it('[C279989] Should no people be involved when no user is typed', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.taskDetails().clickInvolvePeopleButton(); taskPage.taskDetails().clickAddInvolvedUserButton(); @@ -89,7 +89,7 @@ describe('People component', () => { it('[C279990] Should no people be involved when clicking on Cancel button', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.taskDetails().clickInvolvePeopleButton() .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName) @@ -102,7 +102,7 @@ describe('People component', () => { it('[C261029] Should People dialog be displayed when clicking on add people button', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.taskDetails().clickInvolvePeopleButton(); expect(taskPage.taskDetails().getInvolvePeopleHeader()).toEqual('Add people and groups'); @@ -114,7 +114,7 @@ describe('People component', () => { it('[C279991] Should not be able to involve a user when is the creator of the task', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.taskDetails().clickInvolvePeopleButton() .typeUser(processUserModel.firstName + ' ' + processUserModel.lastName) @@ -126,7 +126,7 @@ describe('People component', () => { it('[C261030] Should involved user be removed when clicking on remove button', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]).selectTaskFromTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]).selectRowByContentName(tasks[0]); taskPage.taskDetails().clickInvolvePeopleButton() .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName) @@ -143,7 +143,7 @@ describe('People component', () => { it('[C280013] Should not be able to complete a task by a involved user', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]).selectTaskFromTasksList(tasks[1]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[1]).selectRowByContentName(tasks[1]); taskPage.taskDetails().clickInvolvePeopleButton() .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName) @@ -157,7 +157,7 @@ describe('People component', () => { loginPage.loginToProcessServicesUsingUserModel(assigneeUserModel); processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]).selectTaskFromTasksList(tasks[1]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[1]).selectRowByContentName(tasks[1]); taskPage.completeTaskNoFormNotDisplayed(); }); @@ -166,7 +166,7 @@ describe('People component', () => { loginPage.loginToProcessServicesUsingUserModel(processUserModel); processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]).selectTaskFromTasksList(tasks[2]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[2]).selectRowByContentName(tasks[2]); taskPage.taskDetails().clickInvolvePeopleButton() .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName) @@ -197,7 +197,7 @@ describe('People component', () => { it('[C280014] Should involved user see the task in completed filters when the task is completed', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]).selectTaskFromTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]).selectRowByContentName(tasks[3]); taskPage.taskDetails().clickInvolvePeopleButton() .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName) @@ -210,17 +210,17 @@ describe('People component', () => { taskPage.completeTaskNoForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().selectRowByContentName(tasks[3]); expect(taskPage.taskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)) .toEqual(assigneeUserModel.email); loginPage.loginToProcessServicesUsingUserModel(assigneeUserModel); processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]).selectTaskFromTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]).selectRowByContentName(tasks[3]); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); - taskPage.tasksListPage().checkTaskIsNotDisplayedInTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().checkContentIsNotDisplayed(tasks[3]); }); }); diff --git a/e2e/process-services/sort_tasklist_pagination.e2e.ts b/e2e/process-services/sort_tasklist_pagination.e2e.ts index 0d36a9ebf9..3388af8f7e 100644 --- a/e2e/process-services/sort_tasklist_pagination.e2e.ts +++ b/e2e/process-services/sort_tasklist_pagination.e2e.ts @@ -80,11 +80,11 @@ describe('Task List Pagination - Sorting', () => { it('[C260308] Should be possible to sort tasks by name', () => { processServicesPage.goToProcessServices().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); paginationPage.selectItemsPerPage(itemsPerPage.twenty); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); taskPage.filtersPage().sortByName(true); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); taskPage.filtersPage().getAllRowsNameColumn().then(function (list) { expect(JSON.stringify(list) === JSON.stringify(taskNames)).toEqual(true); }); diff --git a/e2e/process-services/standalone_task.e2e.ts b/e2e/process-services/standalone_task.e2e.ts index 75daee938a..105642cf69 100644 --- a/e2e/process-services/standalone_task.e2e.ts +++ b/e2e/process-services/standalone_task.e2e.ts @@ -75,7 +75,7 @@ describe('Start Task - Task App', () => { taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[0]).clickStartButton() .then(() => { - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]); taskPage.taskDetails().noFormIsDisplayed(); taskPage.taskDetails().checkCompleteTaskButtonIsDisplayed().checkCompleteTaskButtonIsEnabled(); taskPage.taskDetails().checkAttachFormButtonIsDisplayed(); @@ -90,12 +90,12 @@ describe('Start Task - Task App', () => { taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[1]).clickStartButton() .then(() => { - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[1]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[1]); taskPage.formFields().noFormIsDisplayed(); taskPage.completeTaskNoForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(tasks[1]); + taskPage.tasksListPage().getDataTable().selectRowByContentName(tasks[1]); expect(taskPage.formFields().getCompletedTaskNoFormMessage()).toEqual('Task ' + tasks[1] + ' completed'); taskPage.formFields().noFormIsDisplayed(); @@ -108,7 +108,7 @@ describe('Start Task - Task App', () => { taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[2]).clickStartButton() .then(() => { - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[2]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[2]); taskPage.formFields().noFormIsDisplayed(); taskPage.formFields().clickOnAttachFormButton().selectForm(app.formName).clickOnAttachFormButton(); @@ -121,7 +121,7 @@ describe('Start Task - Task App', () => { taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(tasks[3]).addForm(app.formName).clickStartButton(); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]); expect(taskPage.taskDetails().getFormName()).toEqual(app.formName); browser.controlFlow().execute(async () => { @@ -130,7 +130,7 @@ describe('Start Task - Task App', () => { }); browser.refresh(); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[3]); taskPage.checkTaskTitle(tasks[3]); taskPage.formFields().noFormIsDisplayed(); diff --git a/e2e/process-services/start_task_custom_app.e2e.ts b/e2e/process-services/start_task_custom_app.e2e.ts index 40ff16c609..5242219dcf 100644 --- a/e2e/process-services/start_task_custom_app.e2e.ts +++ b/e2e/process-services/start_task_custom_app.e2e.ts @@ -107,7 +107,7 @@ describe('Start Task - Custom App', () => { .then(() => { taskPage .tasksListPage() - .checkTaskIsDisplayedInTasksList(tasks[0]); + .getDataTable().checkContentIsDisplayed(tasks[0]); taskPage .taskDetails() @@ -159,7 +159,7 @@ describe('Start Task - Custom App', () => { taskPage .tasksListPage() - .checkTaskIsDisplayedInTasksList(tasks[2]); + .getDataTable().checkContentIsDisplayed(tasks[2]); taskPage .formFields() @@ -185,7 +185,7 @@ describe('Start Task - Custom App', () => { .clickCancelButton(); taskPage.tasksListPage() - .checkTaskIsNotDisplayedInTasksList(tasks[3]); + .getDataTable().checkContentIsNotDisplayed(tasks[3]); expect(taskPage.filtersPage().getActiveFilter()).toEqual(CONSTANTS.TASK_FILTERS.MY_TASKS); }); @@ -202,7 +202,7 @@ describe('Start Task - Custom App', () => { taskPage .tasksListPage() - .checkTaskIsDisplayedInTasksList(tasks[4]); + .getDataTable().checkContentIsDisplayed(tasks[4]); expect(taskPage.formFields() .setFieldValue(by.id, formTextField, formFieldValue) @@ -215,7 +215,7 @@ describe('Start Task - Custom App', () => { taskPage .tasksListPage() - .checkTaskIsDisplayedInTasksList(tasks[4]); + .getDataTable().checkContentIsDisplayed(tasks[4]); taskPage .formFields() @@ -246,15 +246,15 @@ describe('Start Task - Custom App', () => { taskPage .tasksListPage() - .waitForTableBody(); + .getDataTable().waitForTableBody(); taskPage .filtersPage() .goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); taskPage.tasksListPage() - .checkTaskIsDisplayedInTasksList(tasks[5]) - .selectTaskFromTasksList(tasks[5]); + .getDataTable().checkContentIsDisplayed(tasks[5]) + .selectRowByContentName(tasks[5]); taskPage.checkTaskTitle(tasks[5]); @@ -277,7 +277,7 @@ describe('Start Task - Custom App', () => { processServicesPage.goToProcessServices().goToApp(appModel.name).clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); taskPage.createNewTask().addName(showHeaderTask).clickStartButton(); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(showHeaderTask).selectTaskFromTasksList(showHeaderTask); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(showHeaderTask); appNavigationBarPage.clickSettingsButton(); taskPage.taskDetails().appSettingsToggles().disableShowHeader(); @@ -298,7 +298,7 @@ describe('Start Task - Custom App', () => { taskPage.createNewTask().addName(tasks[7]).clickStartButton(); processServicesPage.goToProcessServices().goToTaskApp(); - taskPage.tasksListPage().checkSpinnerIsDisplayed(); + taskPage.tasksListPage().getDataTable().checkSpinnerIsDisplayed(); }); }); diff --git a/e2e/process-services/start_task_task_app.e2e.ts b/e2e/process-services/start_task_task_app.e2e.ts index aec579cda5..89a33cfd7c 100644 --- a/e2e/process-services/start_task_task_app.e2e.ts +++ b/e2e/process-services/start_task_task_app.e2e.ts @@ -100,7 +100,7 @@ describe('Start Task - Task App', () => { taskPage.createNewTask().addName(tasks[0]) .addForm(app.formName).clickStartButton() .then(() => { - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[0]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[0]); taskPage.taskDetails().clickInvolvePeopleButton() .typeUser(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName) .selectUserToInvolve(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName) @@ -122,7 +122,7 @@ describe('Start Task - Task App', () => { taskPage.createNewTask().checkStartButtonIsDisabled().addName(tasks[3]) .checkStartButtonIsEnabled().clickCancelButton() .then(() => { - taskPage.tasksListPage().checkTaskIsNotDisplayedInTasksList(tasks[3]); + taskPage.tasksListPage().getDataTable().checkContentIsNotDisplayed(tasks[3]); expect(taskPage.filtersPage().getActiveFilter()).toEqual(CONSTANTS.TASK_FILTERS.MY_TASKS); }); }); @@ -133,11 +133,11 @@ describe('Start Task - Task App', () => { taskPage.createNewTask() .addForm(app.formName).addName(tasks[4]).clickStartButton() .then(() => { - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[4]); expect(taskPage.formFields().setFieldValue(by.id, formTextField, formFieldValue) .getFieldValue(formTextField)).toEqual(formFieldValue); taskPage.formFields().refreshForm().checkFieldValue(by.id, formTextField, ''); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[4]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[4]); taskPage.formFields().setFieldValue(by.id, formTextField, formFieldValue) .checkFieldValue(by.id, formTextField, formFieldValue); taskPage.formFields().saveForm().checkFieldValue(by.id, formTextField, formFieldValue); @@ -151,9 +151,9 @@ describe('Start Task - Task App', () => { .addAssignee(assigneeUserModel.firstName).clickStartButton() .then(() => { taskPage.tasksListPage().checkTaskListIsLoaded(); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(tasks[5]).selectTaskFromTasksList(tasks[5]); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(tasks[5]).selectRowByContentName(tasks[5]); taskPage.checkTaskTitle(tasks[5]); expect(taskPage.taskDetails().getAssignee()).toEqual(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName); }); @@ -172,7 +172,7 @@ describe('Start Task - Task App', () => { it('[C260420] Should Information box be hidden when showHeaderContent property is set on false', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(showHeaderTask).selectTaskFromTasksList(showHeaderTask); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(showHeaderTask); appNavigationBarPage.clickSettingsButton(); taskPage.taskDetails().appSettingsToggles().disableShowHeader(); @@ -189,7 +189,7 @@ describe('Start Task - Task App', () => { it('[C260424] Should be able to see Spinner loading on task list when clicking on Tasks', () => { processServicesPage.goToProcessServices().goToTaskApp(); - taskPage.tasksListPage().checkSpinnerIsDisplayed(); + taskPage.tasksListPage().getDataTable().checkSpinnerIsDisplayed(); }); }); diff --git a/e2e/process-services/task-audit.e2e.ts b/e2e/process-services/task-audit.e2e.ts index 326f19a732..72fd36bc0a 100644 --- a/e2e/process-services/task-audit.e2e.ts +++ b/e2e/process-services/task-audit.e2e.ts @@ -75,7 +75,7 @@ describe('Task Audit', () => { it('[C260386] Should Audit file be downloaded when clicking on Task Audit log icon on a standalone running task', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskTaskApp); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskTaskApp); taskPage.taskDetails().clickAuditLogButton(); expect(Util.fileExists(auditLogFile, 10)).toBe(true); @@ -84,11 +84,11 @@ describe('Task Audit', () => { it('[C260389] Should Audit file be downloaded when clicking on Task Audit log icon on a standalone completed task', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskTaskApp); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskTaskApp); taskPage.completeTaskNoForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskTaskApp); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskTaskApp); expect(taskPage.formFields().getCompletedTaskNoFormMessage()).toEqual('Task ' + taskTaskApp + ' completed'); taskPage.taskDetails().clickAuditLogButton(); @@ -101,11 +101,11 @@ describe('Task Audit', () => { taskPage.createNewTask().addName(taskCompleteCustomApp).clickStartButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskCompleteCustomApp); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskCompleteCustomApp); taskPage.completeTaskNoForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskCompleteCustomApp); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskCompleteCustomApp); expect(taskPage.formFields().getCompletedTaskNoFormMessage()).toEqual('Task ' + taskCompleteCustomApp + ' completed'); taskPage.taskDetails().clickAuditLogButton(); @@ -118,7 +118,7 @@ describe('Task Audit', () => { taskPage.createNewTask().addName(taskCustomApp).clickStartButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskCustomApp); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskCustomApp); taskPage.taskDetails().clickAuditLogButton(); expect(Util.fileExists(auditLogFile, 10)).toBe(true); diff --git a/e2e/process-services/task_attachmentList_actionMenu.e2e.ts b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts index 658a1068e9..596663c310 100644 --- a/e2e/process-services/task_attachmentList_actionMenu.e2e.ts +++ b/e2e/process-services/task_attachmentList_actionMenu.e2e.ts @@ -132,7 +132,7 @@ describe('Attachment list action menu for tasks', () => { taskPage.completeTaskNoForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskName.completed); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.completed); attachmentListPage.checkAttachFileButtonIsNotDisplayed(); attachmentListPage.viewFile(pngFile.name); @@ -141,7 +141,7 @@ describe('Attachment list action menu for tasks', () => { viewerPage.clickCloseButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskName.completed); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName.completed); attachmentListPage.downloadFile(pngFile.name); @@ -194,7 +194,7 @@ describe('Attachment list action menu for tasks', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList('SHARE KNOWLEDGE'); + taskPage.tasksListPage().getDataTable().selectRowByContentName('SHARE KNOWLEDGE'); attachmentListPage.checkFileIsAttached(pngFile.name); @@ -205,7 +205,7 @@ describe('Attachment list action menu for tasks', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList('SHARE KNOWLEDGE'); + taskPage.tasksListPage().getDataTable().selectRowByContentName('SHARE KNOWLEDGE'); attachmentListPage.checkEmptyAttachmentList(); }); diff --git a/e2e/process-services/task_details.e2e.ts b/e2e/process-services/task_details.e2e.ts index 83b7a2f35a..5cb1341a69 100644 --- a/e2e/process-services/task_details.e2e.ts +++ b/e2e/process-services/task_details.e2e.ts @@ -82,7 +82,7 @@ describe('Task Details component', () => { }); let taskModel = new TaskModel(allTasks.data[0]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskModel.getName()); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskModel.getName()); expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT)); expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId()); expect(taskPage.taskDetails().getDescription()) @@ -124,7 +124,7 @@ describe('Task Details component', () => { }); let taskModel = new TaskModel(allTasks.data[0]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskModel.getName()); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskModel.getName()); expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT)); expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId()); @@ -171,7 +171,7 @@ describe('Task Details component', () => { let taskModel = new TaskModel(allTasks.data[0]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskModel.getName()); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskModel.getName()); expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT)); expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId()); expect(taskPage.taskDetails().getDescription()) @@ -217,7 +217,7 @@ describe('Task Details component', () => { let taskModel = new TaskModel(allTasks.data[0]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskModel.getName()); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskModel.getName()); expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(taskModel.getCreated(), TASK_DATA_FORMAT)); expect(taskPage.taskDetails().getId()).toEqual(taskModel.getId()); expect(taskPage.taskDetails().getDescription()) @@ -256,19 +256,19 @@ describe('Task Details component', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskName).selectTaskFromTasksList(taskName); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskName).selectRowByContentName(taskName); taskPage.clickOnAddChecklistButton().addName(checklistName).clickCreateChecklistButton(); taskPage.checkChecklistIsDisplayed(checklistName); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(checklistName).selectTaskFromTasksList(checklistName); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(checklistName).selectRowByContentName(checklistName); let allTasks = await browser.controlFlow().execute(async () => { return this.alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' })); }); let checklistTask = new TaskModel(allTasks.data[0]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(checklistTask.getName()); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(checklistTask.getName()); expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(checklistTask.getCreated(), TASK_DATA_FORMAT)); expect(taskPage.taskDetails().getId()).toEqual(checklistTask.getId()); expect(taskPage.taskDetails().getDescription()) @@ -304,14 +304,14 @@ describe('Task Details component', () => { taskPage.clickOnAddChecklistButton().addName(checklistName).clickCreateChecklistButton(); taskPage.checkChecklistIsDisplayed(checklistName); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(checklistName).selectTaskFromTasksList(checklistName); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(checklistName).selectRowByContentName(checklistName); let allTasks = await browser.controlFlow().execute(async () => { return this.alfrescoJsApi.activiti.taskApi.listTasks(new Task({ sort: 'created-desc' })); }); let checklistTask = new TaskModel(allTasks.data[0]); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(checklistTask.getName()); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(checklistTask.getName()); expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(checklistTask.getCreated(), TASK_DATA_FORMAT)); expect(taskPage.taskDetails().getId()).toEqual(checklistTask.getId()); expect(taskPage.taskDetails().getDescription()) @@ -340,18 +340,18 @@ describe('Task Details component', () => { processServicesPage.goToProcessServices().goToTaskApp().clickTasksButton(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.MY_TASKS); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(taskName).selectTaskFromTasksList(taskName); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(taskName).selectRowByContentName(taskName); taskPage.completeTaskNoForm(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.COMPLETED_TASKS); - taskPage.tasksListPage().selectTaskFromTasksList(taskName); + taskPage.tasksListPage().getDataTable().selectRowByContentName(taskName); let getTaskResponse = await browser.controlFlow().execute(async () => { return this.alfrescoJsApi.activiti.taskApi.getTask(taskId.id); }); let completedTask = new TaskModel(getTaskResponse); - taskPage.tasksListPage().checkTaskIsDisplayedInTasksList(completedTask.getName()); + taskPage.tasksListPage().getDataTable().checkContentIsDisplayed(completedTask.getName()); expect(taskPage.taskDetails().getCreated()).toEqual(dateFormat(completedTask.getCreated(), TASK_DATA_FORMAT)); expect(taskPage.taskDetails().getId()).toEqual(completedTask.getId()); expect(taskPage.taskDetails().getDescription()) diff --git a/e2e/process-services/task_details_form.e2e.ts b/e2e/process-services/task_details_form.e2e.ts index 14d321732c..e41141eff2 100644 --- a/e2e/process-services/task_details_form.e2e.ts +++ b/e2e/process-services/task_details_form.e2e.ts @@ -92,7 +92,7 @@ describe('Task Details - Form', () => { }); it('[C280018] Should be able to change the form in a task', () => { - tasksListPage.selectTaskFromTasksList(task.name); + tasksListPage.getDataTable().selectRowByContentName(task.name); taskDetailsPage.checkEditFormButtonIsDisplayed(); taskDetailsPage.clickEditFormButton(); @@ -126,7 +126,7 @@ describe('Task Details - Form', () => { }); it('[C280019] Should be able to remove the form form a task', () => { - tasksListPage.selectTaskFromTasksList(task.name); + tasksListPage.getDataTable().selectRowByContentName(task.name); taskDetailsPage.checkEditFormButtonIsDisplayed(); taskDetailsPage.clickEditFormButton(); @@ -140,14 +140,14 @@ describe('Task Details - Form', () => { }); it('[C280557] Should display task details when selecting another task while the Attach Form dialog is displayed', () => { - tasksListPage.selectTaskFromTasksList(task.name); + tasksListPage.getDataTable().selectRowByContentName(task.name); taskDetailsPage.checkEditFormButtonIsDisplayed(); taskDetailsPage.clickEditFormButton(); taskDetailsPage.checkRemoveAttachFormIsDisplayed(); - tasksListPage.selectTaskFromTasksList(otherTask.name); + tasksListPage.getDataTable().selectRowByContentName(otherTask.name); taskDetailsPage.checkFormIsAttached(otherAttachedForm.name); }); }); diff --git a/e2e/process-services/task_filters_component.e2e.ts b/e2e/process-services/task_filters_component.e2e.ts index 1562b9da73..681c701401 100644 --- a/e2e/process-services/task_filters_component.e2e.ts +++ b/e2e/process-services/task_filters_component.e2e.ts @@ -108,23 +108,23 @@ describe('Task', () => { taskFiltersPage.clickNewTaskButton(); tasksPage.createNewTask().addName('Test').clickStartButton(); taskFiltersPage.clickMyTaskTaskFilter(); - tasksListPage.checkTaskIsDisplayedInTasksList('Test'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test'); expect(taskFiltersPage.checkActiveFilterActive()).toBe('My Tasks'); expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined(); taskFiltersPage.clickQueuedTaskFilter(); expect(taskFiltersPage.checkActiveFilterActive()).toBe('Queued Tasks'); - tasksListPage.checkTaskIsNotDisplayedInTasksList('Test'); + tasksListPage.getDataTable().checkContentIsNotDisplayed('Test'); expect(taskDetailsPage.checkTaskDetailsEmpty()).toBeDefined(); taskFiltersPage.clickInvolvedTaskFilter(); expect(taskFiltersPage.checkActiveFilterActive()).toBe('Involved Tasks'); - tasksListPage.checkTaskIsDisplayedInTasksList('Test'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test'); expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined(); taskFiltersPage.clickCompletedTaskFilter(); expect(taskFiltersPage.checkActiveFilterActive()).toBe('Completed Tasks'); - tasksListPage.checkTaskIsNotDisplayedInTasksList('Test'); + tasksListPage.getDataTable().checkContentIsNotDisplayed('Test'); expect(taskDetailsPage.checkTaskDetailsEmpty()).toBeDefined(); }); @@ -148,7 +148,7 @@ describe('Task', () => { taskFiltersPage.clickNewTaskButton(); tasksPage.createNewTask().addName('Test').clickStartButton(); taskFiltersPage.clickMyTaskTaskFilter(); - tasksListPage.checkTaskIsDisplayedInTasksList('Test'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test'); expect(taskFiltersPage.checkActiveFilterActive()).toBe('My Tasks'); expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined(); @@ -159,7 +159,7 @@ describe('Task', () => { taskFiltersPage.clickInvolvedTaskFilter(); expect(taskFiltersPage.checkActiveFilterActive()).toBe('Involved Tasks'); - tasksListPage.checkTaskIsDisplayedInTasksList('Test'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test'); expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined(); taskFiltersPage.clickCompletedTaskFilter(); @@ -184,27 +184,27 @@ describe('Task', () => { tasksPage.clickOnCreateButton(); taskFiltersPage.clickNewTaskButton(); tasksPage.createNewTask().addName('Test4').clickStartButton(); - tasksListPage.checkTaskIsDisplayedInTasksList('Test4'); - tasksListPage.checkHighlightedTaskInTasksList('Test4'); - tasksListPage.checkTaskIsDisplayedInTasksList('Test3'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test4'); + tasksListPage.getDataTable().checkRowIsSelected('Test4'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test3'); taskDetailsPage.checkTaskDetailsDisplayed(); - tasksListPage.clickSortByName(); - expect(tasksListPage.firstTaskOnTaskList()).toBe('Test3'); - tasksListPage.clickSortByName(); - expect(tasksListPage.firstTaskOnTaskList()).toBe('Test4'); + tasksPage.clickSortByNameAsc(); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe('Test3'); + tasksPage.clickSortByNameDesc(); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe('Test4'); taskFiltersPage.clickCompletedTaskFilter(); - tasksListPage.checkTaskIsDisplayedInTasksList('Test1'); - tasksListPage.checkTaskIsDisplayedInTasksList('Test2'); - expect(tasksListPage.firstTaskOnTaskList()).toBe('Test2'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test1'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test2'); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe('Test2'); - tasksListPage.clickSortByName(); - expect(tasksListPage.firstTaskOnTaskList()).toBe('Test1'); + tasksPage.clickSortByNameAsc(); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe('Test1'); taskFiltersPage.clickInvolvedTaskFilter(); - tasksListPage.checkTaskIsDisplayedInTasksList('Test3'); - tasksListPage.checkTaskIsDisplayedInTasksList('Test4'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test3'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test4'); }); it('[C277264] Should display task filter results when task filter is selected', () => { @@ -213,7 +213,7 @@ describe('Task', () => { tasksPage.createNewTask().addName('Test').clickStartButton(); taskFiltersPage.clickTaskFilter('My Tasks'); - tasksListPage.checkTaskIsDisplayedInTasksList('Test'); + tasksListPage.getDataTable().checkContentIsDisplayed('Test'); expect(taskDetailsPage.getTaskDetailsTitle()).toBe('Test'); }); }); diff --git a/e2e/process-services/task_filters_sorting.e2e.ts b/e2e/process-services/task_filters_sorting.e2e.ts index 6de82974cb..1db7b782f6 100644 --- a/e2e/process-services/task_filters_sorting.e2e.ts +++ b/e2e/process-services/task_filters_sorting.e2e.ts @@ -121,9 +121,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Newest first'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[2].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[1].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[0].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[2].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[0].name); }); @@ -144,9 +144,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Newest last'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[0].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[1].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[2].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[0].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[2].name); }); it('[C277256] Should display tasks under new filter from closest due date to farthest when they are completed', () => { @@ -166,9 +166,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Due first'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[2].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[1].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[0].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[2].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[0].name); }); it('[C277257] Should display tasks under new filter from farthest due date to closest when they are completed', () => { @@ -188,9 +188,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Due last'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[0].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[1].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[2].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[0].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[2].name); }); it('[C277258] Should display tasks under new filter from newest to oldest when they are open ', () => { @@ -210,9 +210,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Newest first Open'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[5].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[4].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[3].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[5].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[3].name); }); it('[C277259] Should display tasks under new filter from oldest to newest when they are open', () => { @@ -232,9 +232,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Newest last Open'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[3].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[4].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[5].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[3].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[5].name); }); it('[C277260] Should display tasks under new filter from closest due date to farthest when they are open', () => { @@ -254,9 +254,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Due first Open'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[5].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[4].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[3].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[5].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[3].name); }); it('[C277261] Should display tasks under new filter from farthest due date to closest when they are open', () => { @@ -276,9 +276,9 @@ describe('Task Filters Sorting', () => { taskFiltersPage.clickTaskFilter('Due last Open'); - expect(tasksListPage.taskOnTaskListInPosition(1)).toBe(tasks[3].name); - expect(tasksListPage.taskOnTaskListInPosition(2)).toBe(tasks[4].name); - expect(tasksListPage.taskOnTaskListInPosition(3)).toBe(tasks[5].name); + expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[3].name); + expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name); + expect(tasksListPage.getDataTable().contentInPosition(3)).toBe(tasks[5].name); }); }); diff --git a/e2e/process-services/task_list_pagination.e2e.ts b/e2e/process-services/task_list_pagination.e2e.ts index 83b0ab9a43..1dcb8093ee 100644 --- a/e2e/process-services/task_list_pagination.e2e.ts +++ b/e2e/process-services/task_list_pagination.e2e.ts @@ -83,7 +83,7 @@ describe('Task List Pagination', () => { processServicesPage.goToProcessServices().goToTaskApp(); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.default); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + nrOfTasks + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(nrOfTasks); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(nrOfTasks); paginationPage.checkNextPageButtonIsDisabled(); paginationPage.checkPreviousPageButtonIsDisabled(); paginationPage.selectItemsPerPage(itemsPerPage.twenty); @@ -97,22 +97,22 @@ describe('Task List Pagination', () => { paginationPage.selectItemsPerPage(itemsPerPage.five); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fiveValue + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fiveValue); paginationPage.clickOnNextPage(); currentPage++; expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five); expect(paginationPage.getPaginationRange()).toEqual('Showing 6-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fiveValue); paginationPage.clickOnNextPage(); currentPage++; expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five); expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fiveValue); paginationPage.clickOnNextPage(); currentPage++; expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.five); expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.fiveValue * currentPage + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fiveValue); processServicesPage.goToProcessServices().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); @@ -125,11 +125,11 @@ describe('Task List Pagination', () => { paginationPage.selectItemsPerPage(itemsPerPage.ten); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.tenValue); paginationPage.clickOnNextPage(); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten); expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.twentyValue + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.tenValue); processServicesPage.goToProcessServices().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); @@ -142,11 +142,11 @@ describe('Task List Pagination', () => { paginationPage.selectItemsPerPage(itemsPerPage.fifteen); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.fifteenValue + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fifteenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fifteenValue); paginationPage.clickOnNextPage(); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.fifteen); expect(paginationPage.getPaginationRange()).toEqual('Showing 16-' + itemsPerPage.twentyValue + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.fiveValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.fiveValue); processServicesPage.goToProcessServices().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); @@ -158,14 +158,14 @@ describe('Task List Pagination', () => { totalPages = 2; processServicesPage.goToProcessServices().goToTaskApp(); taskPage.filtersPage().goToFilter(CONSTANTS.TASK_FILTERS.INV_TASKS); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); paginationPage.selectItemsPerPage(itemsPerPage.ten); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage); expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.tenValue); paginationPage.checkNextPageButtonIsEnabled(); paginationPage.checkPreviousPageButtonIsDisabled(); @@ -173,12 +173,12 @@ describe('Task List Pagination', () => { expect(paginationPage.getPageDropdownOptions()).toEqual(['1', '2']); currentPage = 2; paginationPage.clickOnPageDropdownOption('2'); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage); expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten); expect(paginationPage.getPaginationRange()).toEqual('Showing 11-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.tenValue); paginationPage.checkNextPageButtonIsDisabled(); paginationPage.checkPreviousPageButtonIsEnabled(); @@ -186,12 +186,12 @@ describe('Task List Pagination', () => { expect(paginationPage.getPageDropdownOptions()).toEqual(['1', '2']); currentPage = 1; paginationPage.clickOnPageDropdownOption('1'); - taskPage.tasksListPage().waitForTableBody(); + taskPage.tasksListPage().getDataTable().waitForTableBody(); expect(paginationPage.getCurrentPage()).toEqual('Page ' + currentPage); expect(paginationPage.getTotalPages()).toEqual('of ' + totalPages); expect(paginationPage.getCurrentItemsPerPage()).toEqual(itemsPerPage.ten); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + itemsPerPage.tenValue * currentPage + ' of ' + nrOfTasks); - expect(taskPage.getAllDisplayedRows()).toBe(itemsPerPage.tenValue); + expect(taskPage.tasksListPage().getDataTable().getNumberOfRows()).toBe(itemsPerPage.tenValue); paginationPage.checkNextPageButtonIsEnabled(); paginationPage.checkPreviousPageButtonIsDisabled(); });