inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-4077] - TaskCloud: Refactor priority (#6385)

Browse Source 
* [AAE-4077] - TaskCloud: Refactor priority

* export default priority values

* Fix e2e tests

* fix navigation from task-list

* Update task-list-properties-sort.e2e.ts

* Fix lint

Co-authored-by: Cano <david.cano.nieto@gmail.com>
This commit is contained in:
Silviu Popa
2020-11-26 19:38:40 +02:00
committed by GitHub
parent 5086620991
commit f73dece82d
13 changed files with 99 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e2e/process-services-cloud/task-list-properties-sort.e2e.ts
View File

@@ -39,9 +39,8 @@ describe('Edit task filters and task list properties', () => {
const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name;
const candidateBaseApp = browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP.name;
let createdTask, notDisplayedTask, priorityTask, subTask,
let createdTask, notDisplayedTask, noPriorityTask, lowPriorityTask, normalPriorityTask, hightPriorityTask, subTask,
otherOwnerTask, testUser, groupInfo;
const priority = 1;
beforeAll(async () => {
await apiService.loginWithProfile('identityAdmin');
@@ -59,8 +58,14 @@ describe('Edit task filters and task list properties', () => {
createdTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp);
await tasksService.claimTask(createdTask.entry.id, simpleApp);
priorityTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, { priority: priority });
await tasksService.claimTask(priorityTask.entry.id, simpleApp);
noPriorityTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, { priority: 0 });
lowPriorityTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, { priority: 1 });
normalPriorityTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, { priority: 2 });
hightPriorityTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), simpleApp, { priority: 3 });
await tasksService.claimTask(noPriorityTask.entry.id, simpleApp);
await tasksService.claimTask(lowPriorityTask.entry.id, simpleApp);
await tasksService.claimTask(normalPriorityTask.entry.id, simpleApp);
await tasksService.claimTask(hightPriorityTask.entry.id, simpleApp);
notDisplayedTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateBaseApp);
await tasksService.claimTask(notDisplayedTask.entry.id, candidateBaseApp);
@@ -193,15 +198,14 @@ describe('Edit task filters and task list properties', () => {
});
it('[C290087] Should display tasks ordered by priority when Priority is selected from sort dropdown', async () => {
await tasksCloudDemoPage.editTaskFilterCloudComponent().clearAssignee();
await tasksCloudDemoPage.editTaskFilterCloudComponent().setStatusFilterDropDown('ALL');
await tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('Priority');
await tasksCloudDemoPage.editTaskFilterCloudComponent().setOrderFilterDropDown('ASC');
await expect(await tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Priority', 'NUMBER')).toBe(true);
await expect(await tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkListIsSorted('ASC', 'Priority', 'PRIORITY')).toBe(true);
await tasksCloudDemoPage.editTaskFilterCloudComponent().setOrderFilterDropDown('DESC');
await expect(await tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Priority', 'NUMBER')).toBe(true);
await expect(await tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkListIsSorted('DESC', 'Priority', 'PRIORITY')).toBe(true);
});
it('[C307115] Should display tasks sorted by owner when owner is selected from sort dropdown', async () => {

4
e2e/process-services-cloud/tasks-custom-filters.e2e.ts
View File

@@ -56,7 +56,7 @@ describe('Task filters cloud', () => {
assignedTaskName = StringUtil.generateRandomString(), deletedTaskName = StringUtil.generateRandomString();
let assignedTask, deletedTask, testUser, groupInfo;
const orderByNameAndPriority = ['cCreatedTask', 'dCreatedTask', 'eCreatedTask'];
let priority = 30;
let priority = 1;
const nrOfTasks = 3;
beforeAll(async () => {
@@ -77,7 +77,7 @@ describe('Task filters cloud', () => {
await tasksService.deleteTask(deletedTask.entry.id, simpleApp);
for (let i = 0; i < nrOfTasks; i++) {
await tasksService.createStandaloneTask(orderByNameAndPriority[i], simpleApp, { priority: priority });
priority = priority + 20;
priority = priority + 1;
}
const processDefinition = await processDefinitionService

3
e2e/protractor.excludes.json
View File

@@ -14,6 +14,5 @@
"C277000": "ADF-5283 Fix Permission Flaky test",
"C277003": "ADF-5283 Fix Permission Flaky test",
"C277004": "ADF-5283 Fix Permission Flaky test",
"C299187": "ADF-5285 Failing aspect test",
"C290087": "https://alfresco.atlassian.net/browse/ADF-5292"
"C299187": "ADF-5285 Failing aspect test"
}