From 0915343222cbc8cc48acc0459f5da3e084deed39 Mon Sep 17 00:00:00 2001 From: gmandakini <45559635+gmandakini@users.noreply.github.com> Date: Fri, 12 Apr 2019 09:28:32 +0100 Subject: [PATCH] [ADF-4311] - ProcessCloud - Incorrect label loaded for unclaim option -> "Resqueue" should be "Release" (#4588) * C307032 automated * defined a new TaskDetailsCloudDemoPage under Demo-Shell, as it's not part of a component. --- .../taskDetailsCloudDemoPage.ts | 35 +++++++++++++++++++ .../start-task-custom-app-cloud.e2e.ts | 4 ++- .../task-header-cloud.e2e.ts | 8 +++++ .../pages/task-header-cloud-component.page.ts | 6 ---- 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 e2e/pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage.ts diff --git a/e2e/pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage.ts new file mode 100644 index 0000000000..0fa41b9f3e --- /dev/null +++ b/e2e/pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage.ts @@ -0,0 +1,35 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BrowserVisibility } from '@alfresco/adf-testing'; +import { element, by } from 'protractor'; + +export class TaskDetailsCloudDemoPage { + + taskDetailsHeader = element(by.css(`h4[data-automation-id='task-details-header']`)); + releaseButton = element(by.css('button[adf-cloud-unclaim-task]')); + + getTaskDetailsHeader() { + BrowserVisibility.waitUntilElementIsVisible(this.taskDetailsHeader); + return this.taskDetailsHeader.getText(); + } + + getReleaseButtonText() { + BrowserVisibility.waitUntilElementIsVisible(this.releaseButton); + return this.releaseButton.getText(); + } +} diff --git a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts b/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts index 22c85059f0..4ec50ac6dc 100644 --- a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts @@ -23,6 +23,7 @@ import { StartTasksCloudPage, PeopleCloudComponentPage, TasksService, ApiService, IdentityService } from '@alfresco/adf-testing'; import { browser } from 'protractor'; +import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage'; describe('Start Task', () => { @@ -34,6 +35,7 @@ describe('Start Task', () => { const tasksCloudDemoPage = new TasksCloudDemoPage(); const startTask = new StartTasksCloudPage(); const peopleCloudComponent = new PeopleCloudComponentPage(); + const taskDetailsCloudDemoPage = new TaskDetailsCloudDemoPage(); const standaloneTaskName = StringUtil.generateRandomString(5); const reassignTaskName = StringUtil.generateRandomString(5); const unassignedTaskName = StringUtil.generateRandomString(5); @@ -197,7 +199,7 @@ describe('Start Task', () => { tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(unassignedTaskName); const taskId = tasksCloudDemoPage.taskListCloudComponent().getIdCellValue(unassignedTaskName); tasksCloudDemoPage.taskListCloudComponent().selectRow(unassignedTaskName); - expect(taskHeaderCloudPage.getTaskDetailsHeader()).toContain(taskId); + expect(taskDetailsCloudDemoPage.getTaskDetailsHeader()).toContain(taskId); expect(taskHeaderCloudPage.getAssignee()).toBe('No assignee'); }); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index e519ff0119..996ca06e90 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -24,6 +24,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { LoginSSOPage, SettingsPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { browser } from 'protractor'; +import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage'; describe('Task Header cloud component', () => { @@ -40,6 +41,7 @@ describe('Task Header cloud component', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); + const taskDetailsCloudDemoPage = new TaskDetailsCloudDemoPage(); let tasksService: TasksService; let silentLogin; @@ -143,4 +145,10 @@ describe('Task Header cloud component', () => { .toEqual(subTask.entry.parentTaskId === null ? '' : subTask.entry.parentTaskId); }); + it('[C307032] Should display the appropriate title for the unclaim option of a Task', async () => { + tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); + tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName); + tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName); + expect(taskDetailsCloudDemoPage.getReleaseButtonText()).toBe('Release'); + }); }); diff --git a/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts index de3a940e0d..34b935ed6e 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts @@ -31,7 +31,6 @@ export class TaskHeaderCloudPage { endDateField = element.all(by.css('span[data-automation-id*="endDate"] span')).first(); idField = element.all(by.css('span[data-automation-id*="id"] span')).first(); descriptionField = element(by.css('span[data-automation-id*="description"] span')); - taskDetailsHeader = element(by.css(`h4[data-automation-id='task-details-header']`)); taskPropertyList = element(by.css('adf-cloud-task-header adf-card-view div[class="adf-property-list"]')); getAssignee() { @@ -89,9 +88,4 @@ export class TaskHeaderCloudPage { return this.dueDateField.getText(); } - getTaskDetailsHeader() { - BrowserVisibility.waitUntilElementIsVisible(this.taskPropertyList); - return this.taskDetailsHeader.getText(); - } - }