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 d702bf3926..30edb0093d 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts @@ -83,7 +83,7 @@ describe('Edit task filters cloud', () => { tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); }); - it('[C291786] Delete Save and Save as actions should be displayed when clicking on custom filter header', () => { + it('[C306896] Delete Save and Save as actions should be displayed when clicking on custom filter header', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); tasksCloudDemoPage.myTasksFilter().checkTaskFilterIsDisplayed(); diff --git a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts index 459086ac81..efa1a53430 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts @@ -24,7 +24,7 @@ import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-servic import resources = require('../util/resources'); -describe('Complete task - cloud directive', () => { +describe('Task form cloud component', () => { const loginSSOPage = new LoginSSOPage(); const navigationBarPage = new NavigationBarPage(); @@ -77,73 +77,87 @@ describe('Complete task - cloud directive', () => { done(); }); - beforeEach(() => { + it('[C307032] Should display the appropriate title for the unclaim option of a Task', async () => { navigationBarPage.navigateToProcessServicesCloudPage(); appListCloudComponent.checkApsContainer(); appListCloudComponent.goToApp(candidateuserapp); - }); - - it('[C307093] Complete button is not displayed when the task is already completed', () => { - tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); - expect(tasksCloudDemoPage.getActiveFilterName()).toBe('Completed Tasks'); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(completedTaskName); - tasksCloudDemoPage.taskListCloudComponent().selectRow(completedTaskName); - taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); - taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); - }); - - it('[C307095] Task can not be completed by owner user', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); - tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().clearAssignee().setStatusFilterDropDown('CREATED'); - - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(createdTask.entry.name); - tasksCloudDemoPage.taskListCloudComponent().selectRow(createdTask.entry.name); - taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); - taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); - }); - - it('[C307110] Task list is displayed after clicking on Cancel button', () => { - tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(assigneeTask.entry.name); tasksCloudDemoPage.taskListCloudComponent().selectRow(assigneeTask.entry.name); - taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); - taskDetailsCloudDemoPage.taskFormCloud().clickCancelButton(); - - expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(assigneeTask.entry.name); + expect(taskDetailsCloudDemoPage.getReleaseButtonText()).toBe('RELEASE'); }); - it('[C307094] Standalone Task can be completed by a user that is owner and assignee', () => { - tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); + describe('Complete task - cloud directive', () => { - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(toBeCompletedTask.entry.name); - tasksCloudDemoPage.taskListCloudComponent().selectRow(toBeCompletedTask.entry.name); - taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); - taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsDisplayed().clickCompleteButton(); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(toBeCompletedTask.entry.name); + beforeEach((done) => { + navigationBarPage.navigateToProcessServicesCloudPage(); + appListCloudComponent.checkApsContainer(); + appListCloudComponent.goToApp(candidateuserapp); + done(); + }); - tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(toBeCompletedTask.entry.name); - taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); - }); + it('[C307093] Complete button is not displayed when the task is already completed', () => { + tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); + expect(tasksCloudDemoPage.getActiveFilterName()).toBe('Completed Tasks'); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(completedTaskName); + tasksCloudDemoPage.taskListCloudComponent().selectRow(completedTaskName); + taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); + taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); + }); - it('[C307111] Task of a process can be completed by a user that is owner and assignee', () => { - tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); + it('[C307095] Task can not be completed by owner user', () => { + tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); + expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); + tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().clearAssignee().setStatusFilterDropDown('CREATED'); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(claimedTask.entry.name); - tasksCloudDemoPage.taskListCloudComponent().selectRow(claimedTask.entry.name); - taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); - taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsDisplayed().clickCompleteButton(); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(claimedTask.entry.name); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(createdTask.entry.name); + tasksCloudDemoPage.taskListCloudComponent().selectRow(createdTask.entry.name); + taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); + taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); + }); - tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(claimedTask.entry.name); - taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); + it('[C307110] Task list is displayed after clicking on Cancel button', () => { + tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); + expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); + + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(assigneeTask.entry.name); + tasksCloudDemoPage.taskListCloudComponent().selectRow(assigneeTask.entry.name); + taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); + taskDetailsCloudDemoPage.taskFormCloud().clickCancelButton(); + + expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(assigneeTask.entry.name); + }); + + it('[C307094] Standalone Task can be completed by a user that is owner and assignee', () => { + tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); + expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); + + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(toBeCompletedTask.entry.name); + tasksCloudDemoPage.taskListCloudComponent().selectRow(toBeCompletedTask.entry.name); + taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); + taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsDisplayed().clickCompleteButton(); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(toBeCompletedTask.entry.name); + + tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(toBeCompletedTask.entry.name); + taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); + }); + + it('[C307111] Task of a process can be completed by a user that is owner and assignee', () => { + tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); + expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); + + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(claimedTask.entry.name); + tasksCloudDemoPage.taskListCloudComponent().selectRow(claimedTask.entry.name); + taskDetailsCloudDemoPage.checkTaskDetailsHeaderIsDisplayed(); + taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsDisplayed().clickCompleteButton(); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsNotDisplayedByName(claimedTask.entry.name); + + tasksCloudDemoPage.completedTasksFilter().clickTaskFilter(); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(claimedTask.entry.name); + taskDetailsCloudDemoPage.taskFormCloud().checkCompleteButtonIsNotDisplayed(); + }); }); }); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index df2f931129..0dce10bd02 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -23,14 +23,22 @@ import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { LoginSSOPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; -import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage'; import resources = require('../util/resources'); describe('Task Header cloud component', () => { - const basicCreatedTaskName = StringUtil.generateRandomString(), completedTaskName = StringUtil.generateRandomString(); - let basicCreatedTask, basicCreatedDate, completedTask, completedCreatedDate, subTask, subTaskCreatedDate; + const basicCreatedTaskName = StringUtil.generateRandomString(); + const completedTaskName = StringUtil.generateRandomString(); + let basicCreatedTask; + let basicCreatedDate; + let completedTask; + let completedCreatedDate; + let subTask; + let subTaskCreatedDate; + let completedEndDate; const simpleApp = resources.ACTIVITI7_APPS.SIMPLE_APP.name; - const priority = 30, description = 'descriptionTask', formatDate = 'DD-MM-YYYY'; + const priority = 30; + const description = 'descriptionTask'; + const formatDate = 'DD-MM-YYYY'; const taskHeaderCloudPage = new TaskHeaderCloudPage(); @@ -38,7 +46,6 @@ describe('Task Header cloud component', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const taskDetailsCloudDemoPage = new TaskDetailsCloudDemoPage(); const settingsPage = new SettingsPage(); let tasksService: TasksService; @@ -59,6 +66,7 @@ describe('Task Header cloud component', () => { await tasksService.completeTask(completedTaskId.entry.id, simpleApp); completedTask = await tasksService.getTask(completedTaskId.entry.id, simpleApp); completedCreatedDate = moment(completedTask.entry.createdDate).format(formatDate); + completedEndDate = moment(completedTask.entry.endDate).format(formatDate); const subTaskId = await tasksService.createStandaloneSubtask(createdTaskId.entry.id, simpleApp, StringUtil.generateRandomString()); await tasksService.claimTask(subTaskId.entry.id, simpleApp); @@ -92,6 +100,7 @@ describe('Task Header cloud component', () => { CONSTANTS.TASK_DETAILS.NO_CATEGORY : basicCreatedTask.entry.category); expect(taskHeaderCloudPage.getDueDate()).toEqual(basicCreatedTask.entry.dueDate === null ? CONSTANTS.TASK_DETAILS.NO_DATE : basicCreatedDate); + expect(taskHeaderCloudPage.getEndDate()).toEqual(''); expect(taskHeaderCloudPage.getCreated()).toEqual(basicCreatedDate); expect(taskHeaderCloudPage.getAssignee()).toEqual(basicCreatedTask.entry.assignee === null ? '' : basicCreatedTask.entry.assignee); expect(taskHeaderCloudPage.getParentName()).toEqual(CONSTANTS.TASK_DETAILS.NO_PARENT); @@ -112,6 +121,7 @@ describe('Task Header cloud component', () => { CONSTANTS.TASK_DETAILS.NO_CATEGORY : completedTask.entry.category); expect(taskHeaderCloudPage.getDueDate()).toEqual(completedTask.entry.dueDate === null ? CONSTANTS.TASK_DETAILS.NO_DATE : completedCreatedDate); + expect(taskHeaderCloudPage.getEndDate()).toEqual(completedEndDate); expect(taskHeaderCloudPage.getCreated()).toEqual(completedCreatedDate); expect(taskHeaderCloudPage.getAssignee()).toEqual(completedTask.entry.assignee === null ? '' : completedTask.entry.assignee); expect(taskHeaderCloudPage.getParentName()).toEqual(CONSTANTS.TASK_DETAILS.NO_PARENT); @@ -132,17 +142,11 @@ describe('Task Header cloud component', () => { CONSTANTS.TASK_DETAILS.NO_CATEGORY : subTask.entry.category); expect(taskHeaderCloudPage.getDueDate()).toEqual(subTask.entry.dueDate === null ? CONSTANTS.TASK_DETAILS.NO_DATE : subTaskCreatedDate); + expect(taskHeaderCloudPage.getEndDate()).toEqual(''); expect(taskHeaderCloudPage.getCreated()).toEqual(subTaskCreatedDate); expect(taskHeaderCloudPage.getAssignee()).toEqual(subTask.entry.assignee === null ? '' : subTask.entry.assignee); expect(taskHeaderCloudPage.getParentName()).toEqual(basicCreatedTask.entry.name); expect(taskHeaderCloudPage.getParentTaskId()) .toEqual(subTask.entry.parentTaskId === null ? '' : subTask.entry.parentTaskId); }); - - it('[C307032] Should display the appropriate title for the unclaim option of a Task', () => { - tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); - tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName); - tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName); - expect(taskDetailsCloudDemoPage.getReleaseButtonText()).toBe('RELEASE'); - }); });