inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3753]Refactor task filters page (#3969)

Browse Source 
* Refactoring taskFiltersPage

* Refactor task filters page

* Fix lint errors

* no message
This commit is contained in:
cristinaj 2018-11-15 14:28:27 +02:00 committed by Eugenio Romano
parent 54cbd210a1
commit 534954ffef
9 changed files with 191 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/core/card-view/aspect-oriented-config.e2e.ts
View File

@ -172,7 +172,7 @@ describe('Aspect oriented config', () => {
metadataViewPage.checkMetadataGroupIsPresent('Content');
});
it('[C260182] Should show all the aspects if the default configuration contains the * symbol' , () => {
it('[C260182] Should show all the aspects if the default configuration contains the asterisk symbol' , () => {
configEditorPage.enterConfiguration('{' +
' "presets": {' +

1
e2e/pages/adf/dataTablePage.js
View File

@ -242,7 +242,6 @@ var DataTablePage = function (rootElement = element(by.css("adf-datatable"))) {
return inputFilter.sendKeys(filterText);
};
this.getNodeIdFirstElement = function () {
let firstNode = element.all(by.css('adf-datatable div[title="Node id"] span')).first();
return firstNode.getText();

60
e2e/pages/adf/demo-shell/taskFiltersDemoPage.ts Normal file
View File

@ -0,0 +1,60 @@
/*!
* @license
* Copyright 2016 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 Util = require('../../../util/util');
import { element, by } from 'protractor';
import { TaskFiltersPage } from '../process_services/taskFiltersPage';
export class TaskFiltersDemoPage {
myTasks = element(by.css('span[data-automation-id="My Tasks_filter"]'));
queuedTask = element(by.css('span[data-automation-id="Queued Tasks_filter"]'));
completedTask = element(by.css('span[data-automation-id="Completed Tasks_filter"]'));
involvedTask = element(by.css('span[data-automation-id="Involved Tasks_filter"]'));
activeFilter = element(by.css("mat-list-item[class*='active']"));
taskFiltersPage(filter) {
return new TaskFiltersPage(filter);
}
myTasksFilter() {
return new TaskFiltersPage(this.myTasks);
}
queuedTasksFilter() {
return new TaskFiltersPage(this.queuedTask);
}
completedTasksFilter() {
return new TaskFiltersPage(this.completedTask);
}
involvedTasksFilter() {
return new TaskFiltersPage(this.involvedTask);
}
customTaskFilter(filterName) {
return new TaskFiltersPage(element(by.css(`span[data-automation-id="${filterName}_filter"]`)));
}
checkActiveFilterActive () {
Util.waitUntilElementIsVisible(this.activeFilter);
return this.activeFilter.getText();
}
}

6
e2e/pages/adf/process_services/taskDetailsPage.ts
View File

@ -64,6 +64,7 @@ export class TaskDetailsPage {
disabledAttachFormButton = element(by.css('button[id="adf-no-form-attach-form-button"][disabled]'));
removeAttachForm = element(by.id('adf-no-form-remove-button'));
attachFormName = element(by.css('span[class="adf-form-title ng-star-inserted"]'));
emptyTaskDetails = element(by.css('adf-task-details > div > div'));
getTaskDetailsTitle() {
Util.waitUntilElementIsVisible(this.taskDetailsTitle);
@ -421,4 +422,9 @@ export class TaskDetailsPage {
return this.completeFormTask.click();
}
getEmptyTaskDetailsMessage() {
Util.waitUntilElementIsVisible(this.emptyTaskDetails);
return this.emptyTaskDetails.getText();
}
}

148
e2e/pages/adf/process_services/taskFiltersPage.js
View File

@ -1,148 +0,0 @@
/*!
* @license
* Copyright 2016 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.
*/
var Util = require('../../../util/util');
var TaskFiltersPage = function () {
var myTasks = element(by.css('span[data-automation-id="My Tasks_filter"]'));
var queuedTask = element(by.css('span[data-automation-id="Queued Tasks_filter"]'));
var completedTask = element(by.css('span[data-automation-id="Completed Tasks_filter"]'));
var involvedTask = element(by.css('span[data-automation-id="Involved Tasks_filter"]'));
var tasksAccordionButton = element(by.css('div[class="adf-panel-heading adf-panel-heading-selected"]'));
var tasksAccordionExpanded = element(by.css("mat-expansion-panel[class*='mat-expanded']"));
var startTaskButton = element(by.css('button[id="button-start"]'));
var newTaskButton = element(by.css('button[data-automation-id="btn-start-task"]'));
var activeFilter = element(by.css("mat-list-item[class*='active']"));
var emptyTaskList = element(by.css('p[class="adf-empty-content__title"]'));
var emptyTaskDetails = element(by.css('adf-task-details > div > div'));
var taskIcon = by.xpath("ancestor::div[@class='mat-list-item-content']/mat-icon");
this.checkTaskFilterDisplayed = function(name) {
var customTask = element(by.css(`span[data-automation-id="${name}_filter"]`));
Util.waitUntilElementIsVisible(customTask);
return customTask;
};
this.getTaskFilterIcon = function(name) {
var customTask = element(by.css(`span[data-automation-id="${name}_filter"]`));
Util.waitUntilElementIsVisible(customTask);
var icon = customTask.element(taskIcon);
Util.waitUntilElementIsVisible(icon);
return icon.getText();
};
this.checkTaskFilterHasNoIcon = function(name) {
var customTask = element(by.css(`span[data-automation-id="${name}_filter"]`));
Util.waitUntilElementIsVisible(customTask);
Util.waitUntilElementIsNotOnPage(customTask.element(taskIcon));
};
this.clickTaskFilter = function(name) {
var customTask = element(by.css(`span[data-automation-id="${name}_filter"]`));
Util.waitUntilElementIsVisible(customTask);
return customTask.click();
};
this.checkTaskFilterNotDisplayed = function(name) {
var customTask = element(by.css(`span[data-automation-id="${name}_filter"]`));
Util.waitUntilElementIsNotVisible(customTask);
return customTask;
};
this.checkMyTasksFilter = function() {
Util.waitUntilElementIsVisible(myTasks);
return myTasks;
};
this.checkQueuedTaskFilter = function() {
Util.waitUntilElementIsVisible(queuedTask);
return queuedTask;
};
this.clickMyTaskTaskFilter = function() {
Util.waitUntilElementIsVisible(myTasks);
return myTasks.click();
};
this.clickCompletedTaskFilter = function() {
Util.waitUntilElementIsClickable(completedTask);
return completedTask.click();
};
this.checkCompletedTaskFilter = function() {
Util.waitUntilElementIsVisible(completedTask);
return completedTask;
};
this.clickQueuedTaskFilter = function() {
Util.waitUntilElementIsVisible(queuedTask);
return queuedTask.click();
};
this.clickInvolvedTaskFilter = function() {
Util.waitUntilElementIsVisible(involvedTask);
return involvedTask.click();
};
this.checkInvolvedTaskFilter = function() {
Util.waitUntilElementIsVisible(involvedTask);
return involvedTask;
};
this.clickTasksAccordionButton = function() {
Util.waitUntilElementIsVisible(tasksAccordionButton);
return tasksAccordionButton.click();
};
this.checkTasksAccordionExtended = function() {
Util.waitUntilElementIsVisible(tasksAccordionExpanded);
return tasksAccordionExpanded;
};
this.checkTasksAccordionClosed = function() {
Util.waitUntilElementIsNotVisible(tasksAccordionExpanded);
return tasksAccordionExpanded;
};
this.clickStartTaskButton = function() {
Util.waitUntilElementIsVisible(startTaskButton);
startTaskButton.click();
};
this.clickNewTaskButton = function() {
Util.waitUntilElementIsVisible(newTaskButton);
newTaskButton.click();
};
this.checkActiveFilterActive = function() {
Util.waitUntilElementIsVisible(activeFilter);
return activeFilter.getText();
}
this.checkEmptyTaskList = function() {
Util.waitUntilElementIsVisible(emptyTaskList);
return emptyTaskList.getText();
};
this.checkEmptyTaskDetails = function() {
Util.waitUntilElementIsVisible(emptyTaskDetails);
return emptyTaskDetails.getText();
}
};
module.exports = TaskFiltersPage;

57
e2e/pages/adf/process_services/taskFiltersPage.ts Normal file
View File

@ -0,0 +1,57 @@
/*!
* @license
* Copyright 2016 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 Util = require('../../../util/util');
import { by } from 'protractor';
export class TaskFiltersPage {
filter;
taskIcon = by.xpath("ancestor::div[@class='mat-list-item-content']/mat-icon");
constructor(filter) {
this.filter = filter;
}
checkTaskFilterIsDisplayed() {
Util.waitUntilElementIsVisible(this.filter);
return this;
}
getTaskFilterIcon() {
Util.waitUntilElementIsVisible(this.filter);
let icon = this.filter.element(this.taskIcon);
Util.waitUntilElementIsVisible(icon);
return icon.getText();
}
checkTaskFilterHasNoIcon() {
Util.waitUntilElementIsVisible(this.filter);
Util.waitUntilElementIsNotOnPage(this.filter.element(this.taskIcon));
}
clickTaskFilter() {
Util.waitUntilElementIsVisible(this.filter);
return this.filter.click();
}
checkTaskFilterNotDisplayed() {
Util.waitUntilElementIsNotVisible(this.filter);
return this.filter;
}
}

6
e2e/pages/adf/process_services/tasksListPage.js
View File

@ -21,6 +21,7 @@ var DataTablePage = require('../dataTablePage');
var TasksListPage = function () {
var taskList = element(by.css("adf-tasklist"));
var noTasksFound = element(by.css("p[class='adf-empty-content__title']"));
var dataTable = new DataTablePage(taskList);
@ -33,6 +34,11 @@ var TasksListPage = function () {
return this;
};
this.getNoTasksFoundMessage = function() {
Util.waitUntilElementIsVisible(noTasksFound);
return noTasksFound.getText();
};
};
module.exports = TasksListPage;

121
e2e/process-services/task_filters_component.e2e.ts
View File

@ -23,10 +23,10 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
import { TasksPage } from '../pages/adf/process_services/tasksPage';
import TasksListPage = require('../pages/adf/process_services/tasksListPage');
import TaskFiltersPage = require('../pages/adf/process_services/taskFiltersPage');
import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage';
import { AppNavigationBarPage } from '../pages/adf/process_services/appNavigationBarPage';
import { AppSettingsToggles } from '../pages/adf/process_services/dialog/appSettingsToggles';
import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/taskFiltersDemoPage';
import AlfrescoApi = require('alfresco-js-api-node');
import { AppsActions } from '../actions/APS/apps.actions';
@ -42,8 +42,8 @@ describe('Task', () => {
let processServicesPage = new ProcessServicesPage();
let tasksPage = new TasksPage();
let tasksListPage = new TasksListPage();
let taskFiltersPage = new TaskFiltersPage();
let taskDetailsPage = new TaskDetailsPage();
let taskFiltersDemoPage = new TaskFiltersDemoPage();
let app = resources.Files.APP_WITH_DATE_FIELD_FORM;
let appId, tenantId;
@ -97,92 +97,75 @@ describe('Task', () => {
});
it('[C279967] Should display default filters when an app is deployed', () => {
taskFiltersPage.checkTaskFilterDisplayed('Involved Tasks');
taskFiltersPage.checkTaskFilterDisplayed('My Tasks');
taskFiltersPage.checkTaskFilterDisplayed('Queued Tasks');
taskFiltersPage.checkTaskFilterDisplayed('Completed Tasks');
taskFiltersDemoPage.involvedTasksFilter().checkTaskFilterIsDisplayed();
taskFiltersDemoPage.myTasksFilter().checkTaskFilterIsDisplayed();
taskFiltersDemoPage.queuedTasksFilter().checkTaskFilterIsDisplayed();
taskFiltersDemoPage.completedTasksFilter().checkTaskFilterIsDisplayed();
});
it('[C260330] Should display Task Filter List when app is in Task Tab', () => {
tasksPage.clickOnCreateButton();
taskFiltersPage.clickNewTaskButton();
tasksPage.createNewTask().addName('Test').clickStartButton();
taskFiltersPage.clickMyTaskTaskFilter();
taskFiltersDemoPage.myTasksFilter().clickTaskFilter();
tasksListPage.getDataTable().checkContentIsDisplayed('Test');
expect(taskFiltersPage.checkActiveFilterActive()).toBe('My Tasks');
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('My Tasks');
expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
taskFiltersPage.clickQueuedTaskFilter();
expect(taskFiltersPage.checkActiveFilterActive()).toBe('Queued Tasks');
taskFiltersDemoPage.queuedTasksFilter().clickTaskFilter();
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('Queued Tasks');
tasksListPage.getDataTable().checkContentIsNotDisplayed('Test');
expect(taskDetailsPage.checkTaskDetailsEmpty()).toBeDefined();
taskFiltersPage.clickInvolvedTaskFilter();
expect(taskFiltersPage.checkActiveFilterActive()).toBe('Involved Tasks');
taskFiltersDemoPage.involvedTasksFilter().clickTaskFilter();
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('Involved Tasks');
tasksListPage.getDataTable().checkContentIsDisplayed('Test');
expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
taskFiltersPage.clickCompletedTaskFilter();
expect(taskFiltersPage.checkActiveFilterActive()).toBe('Completed Tasks');
taskFiltersDemoPage.completedTasksFilter().clickTaskFilter();
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('Completed Tasks');
tasksListPage.getDataTable().checkContentIsNotDisplayed('Test');
expect(taskDetailsPage.checkTaskDetailsEmpty()).toBeDefined();
});
it('[C260348] Should display task in Complete Tasks List when task is completed', () => {
expect(taskFiltersPage.checkMyTasksFilter()).toBeDefined();
expect(taskFiltersPage.checkQueuedTaskFilter()).toBeDefined();
expect(taskFiltersPage.checkInvolvedTaskFilter()).toBeDefined();
expect(taskFiltersPage.checkCompletedTaskFilter()).toBeDefined();
expect(taskFiltersPage.checkTasksAccordionExtended()).toBeDefined();
expect(taskFiltersDemoPage.myTasksFilter().checkTaskFilterIsDisplayed()).toBeDefined();
expect(taskFiltersDemoPage.queuedTasksFilter().checkTaskFilterIsDisplayed()).toBeDefined();
expect(taskFiltersDemoPage.involvedTasksFilter().checkTaskFilterIsDisplayed()).toBeDefined();
expect(taskFiltersDemoPage.completedTasksFilter().checkTaskFilterIsDisplayed).toBeDefined();
taskFiltersPage.clickTasksAccordionButton();
expect(taskFiltersPage.checkTasksAccordionClosed()).toBeDefined();
expect(taskFiltersDemoPage.myTasksFilter().checkTaskFilterIsDisplayed()).toBeDefined();
expect(taskFiltersDemoPage.queuedTasksFilter().checkTaskFilterIsDisplayed()).toBeDefined();
expect(taskFiltersDemoPage.involvedTasksFilter().checkTaskFilterIsDisplayed).toBeDefined();
expect(taskFiltersDemoPage.completedTasksFilter().checkTaskFilterIsDisplayed).toBeDefined();
taskFiltersPage.clickTasksAccordionButton();
expect(taskFiltersPage.checkMyTasksFilter()).toBeDefined();
expect(taskFiltersPage.checkQueuedTaskFilter()).toBeDefined();
expect(taskFiltersPage.checkInvolvedTaskFilter()).toBeDefined();
expect(taskFiltersPage.checkCompletedTaskFilter()).toBeDefined();
tasksPage.clickOnCreateButton();
taskFiltersPage.clickNewTaskButton();
tasksPage.createNewTask().addName('Test').clickStartButton();
taskFiltersPage.clickMyTaskTaskFilter();
taskFiltersDemoPage.myTasksFilter().clickTaskFilter();
tasksListPage.getDataTable().checkContentIsDisplayed('Test');
expect(taskFiltersPage.checkActiveFilterActive()).toBe('My Tasks');
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('My Tasks');
expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
taskFiltersPage.clickQueuedTaskFilter();
expect(taskFiltersPage.checkActiveFilterActive()).toBe('Queued Tasks');
expect(taskFiltersPage.checkEmptyTaskList()).toBe('No Tasks Found');
expect(taskFiltersPage.checkEmptyTaskDetails()).toBe('No task details found');
taskFiltersDemoPage.queuedTasksFilter().clickTaskFilter();
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('Queued Tasks');
expect(tasksListPage.getNoTasksFoundMessage()).toBe('No Tasks Found');
expect(taskDetailsPage.getEmptyTaskDetailsMessage()).toBe('No task details found');
taskFiltersPage.clickInvolvedTaskFilter();
expect(taskFiltersPage.checkActiveFilterActive()).toBe('Involved Tasks');
taskFiltersDemoPage.involvedTasksFilter().clickTaskFilter();
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('Involved Tasks');
tasksListPage.getDataTable().checkContentIsDisplayed('Test');
expect(taskDetailsPage.checkTaskDetailsDisplayed()).toBeDefined();
taskFiltersPage.clickCompletedTaskFilter();
expect(taskFiltersPage.checkActiveFilterActive()).toBe('Completed Tasks');
expect(taskFiltersPage.checkEmptyTaskList()).toBe('No Tasks Found');
expect(taskFiltersPage.checkEmptyTaskDetails()).toBe('No task details found');
taskFiltersDemoPage.completedTasksFilter().clickTaskFilter();
expect(taskFiltersDemoPage.checkActiveFilterActive()).toBe('Completed Tasks');
expect(tasksListPage.getNoTasksFoundMessage()).toBe('No Tasks Found');
expect(taskDetailsPage.getEmptyTaskDetailsMessage()).toBe('No task details found');
});
it('[C260349] Should sort task by name when Name sorting is clicked', () => {
tasksPage.clickOnCreateButton();
taskFiltersPage.clickNewTaskButton();
tasksPage.createNewTask().addName('Test1').clickStartButton();
taskDetailsPage.clickCompleteTask();
tasksPage.clickOnCreateButton();
taskFiltersPage.clickNewTaskButton();
tasksPage.createNewTask().addName('Test2').clickStartButton();
taskDetailsPage.clickCompleteTask();
tasksPage.clickOnCreateButton();
taskFiltersPage.clickNewTaskButton();
tasksPage.createNewTask().addName('Test3').clickStartButton();
tasksPage.clickOnCreateButton();
taskFiltersPage.clickNewTaskButton();
tasksPage.createNewTask().addName('Test4').clickStartButton();
tasksListPage.getDataTable().checkContentIsDisplayed('Test4');
tasksListPage.getDataTable().checkRowIsSelected('Test4');
@ -194,7 +177,7 @@ describe('Task', () => {
tasksPage.clickSortByNameDesc();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe('Test4');
taskFiltersPage.clickCompletedTaskFilter();
taskFiltersDemoPage.completedTasksFilter().clickTaskFilter();
tasksListPage.getDataTable().checkContentIsDisplayed('Test1');
tasksListPage.getDataTable().checkContentIsDisplayed('Test2');
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe('Test2');
@ -202,17 +185,15 @@ describe('Task', () => {
tasksPage.clickSortByNameAsc();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe('Test1');
taskFiltersPage.clickInvolvedTaskFilter();
taskFiltersDemoPage.involvedTasksFilter().clickTaskFilter();
tasksListPage.getDataTable().checkContentIsDisplayed('Test3');
tasksListPage.getDataTable().checkContentIsDisplayed('Test4');
});
it('[C277264] Should display task filter results when task filter is selected', () => {
tasksPage.clickOnCreateButton();
taskFiltersPage.clickNewTaskButton();
tasksPage.createNewTask().addName('Test').clickStartButton();
taskFiltersPage.clickTaskFilter('My Tasks');
taskFiltersDemoPage.myTasksFilter().clickTaskFilter();
tasksListPage.getDataTable().checkContentIsDisplayed('Test');
expect(taskDetailsPage.getTaskDetailsTitle()).toBe('Test');
});
@ -223,9 +204,9 @@ describe('Task', () => {
let loginPage = new LoginPage();
let navigationBarPage = new NavigationBarPage();
let processServicesPage = new ProcessServicesPage();
let taskFiltersPage = new TaskFiltersPage();
let appNavigationBarPage = new AppNavigationBarPage();
let appSettingsToggles = new AppSettingsToggles();
let taskFiltersDemoPage = new TaskFiltersDemoPage();
let user;
let appId;
@ -286,7 +267,7 @@ describe('Task', () => {
browser.refresh();
taskFiltersPage.checkTaskFilterDisplayed('New Task Filter');
taskFiltersDemoPage.customTaskFilter('New Task Filter').checkTaskFilterIsDisplayed();
browser.controlFlow().execute(() => {
let result = this.alfrescoJsApi.activiti.userFiltersApi.deleteUserTaskFilter(taskFilterId);
@ -313,8 +294,8 @@ describe('Task', () => {
appSettingsToggles.enableTaskFiltersIcon();
appNavigationBarPage.clickTasksButton();
taskFiltersPage.checkTaskFilterDisplayed('New Task Filter with icon');
expect(taskFiltersPage.getTaskFilterIcon('New Task Filter with icon')).toEqual('cloud');
taskFiltersDemoPage.customTaskFilter('New Task Filter with icon').checkTaskFilterIsDisplayed();
expect(taskFiltersDemoPage.customTaskFilter('New Task Filter with icon').getTaskFilterIcon()).toEqual('cloud');
browser.controlFlow().execute(() => {
let result = this.alfrescoJsApi.activiti.userFiltersApi.deleteUserTaskFilter(taskFilterId);
@ -323,14 +304,14 @@ describe('Task', () => {
});
it('[C286449] Should display task filter icons only when showIcon property is set on true', () => {
taskFiltersPage.checkTaskFilterHasNoIcon('My Tasks');
taskFiltersDemoPage.myTasksFilter().checkTaskFilterHasNoIcon();
appNavigationBarPage.clickSettingsButton();
appSettingsToggles.enableTaskFiltersIcon();
appNavigationBarPage.clickTasksButton();
taskFiltersPage.checkTaskFilterDisplayed('My Tasks');
expect(taskFiltersPage.getTaskFilterIcon('My Tasks')).toEqual('inbox');
taskFiltersDemoPage.myTasksFilter().checkTaskFilterIsDisplayed();
expect(taskFiltersDemoPage.myTasksFilter().getTaskFilterIcon()).toEqual('inbox');
});
it('[C260353] Should display changes on a filter when this filter is edited', () => {
@ -349,7 +330,7 @@ describe('Task', () => {
browser.refresh();
taskFiltersPage.checkTaskFilterDisplayed('New Task Filter');
taskFiltersDemoPage.customTaskFilter('New Task Filter').checkTaskFilterIsDisplayed();
browser.controlFlow().execute(() => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
@ -364,7 +345,7 @@ describe('Task', () => {
browser.refresh();
taskFiltersPage.checkTaskFilterDisplayed('Task Filter Edited');
taskFiltersDemoPage.customTaskFilter('Task Filter Edited').checkTaskFilterIsDisplayed();
browser.controlFlow().execute(() => {
let result = this.alfrescoJsApi.activiti.userFiltersApi.deleteUserTaskFilter(taskFilterId);
@ -388,7 +369,7 @@ describe('Task', () => {
browser.refresh();
taskFiltersPage.checkTaskFilterDisplayed('Task Filter Edited icon');
taskFiltersDemoPage.customTaskFilter('Task Filter Edited icon').checkTaskFilterIsDisplayed();
browser.controlFlow().execute(() => {
let newFilter = new this.alfrescoJsApi.activiti.UserProcessInstanceFilterRepresentation();
@ -406,8 +387,8 @@ describe('Task', () => {
appSettingsToggles.enableTaskFiltersIcon();
appNavigationBarPage.clickTasksButton();
taskFiltersPage.checkTaskFilterDisplayed('Task Filter Edited icon');
expect(taskFiltersPage.getTaskFilterIcon('Task Filter Edited icon')).toEqual('cloud');
taskFiltersDemoPage.customTaskFilter('Task Filter Edited icon').checkTaskFilterIsDisplayed();
expect(taskFiltersDemoPage.customTaskFilter('Task Filter Edited icon').getTaskFilterIcon()).toEqual('cloud');
});
it('[C260354] Should not display task filter when this filter is deleted', () => {
@ -426,7 +407,7 @@ describe('Task', () => {
browser.refresh();
taskFiltersPage.checkTaskFilterDisplayed('New Task Filter');
taskFiltersDemoPage.customTaskFilter('New Task Filter').checkTaskFilterIsDisplayed();
browser.controlFlow().execute(() => {
let result = this.alfrescoJsApi.activiti.userFiltersApi.deleteUserTaskFilter(taskFilterId);
@ -435,7 +416,7 @@ describe('Task', () => {
browser.refresh();
taskFiltersPage.checkTaskFilterNotDisplayed('New Task Filter');
taskFiltersDemoPage.customTaskFilter('New Task Filter').checkTaskFilterNotDisplayed();
});
});

20
e2e/process-services/task_filters_sorting.e2e.ts
View File

@ -22,8 +22,8 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage';
import { ProcessServicesPage } from '../pages/adf/process_services/processServicesPage';
import { TasksPage } from '../pages/adf/process_services/tasksPage';
import TasksListPage = require('../pages/adf/process_services/tasksListPage');
import TaskFiltersPage = require('../pages/adf/process_services/taskFiltersPage');
import { TaskDetailsPage } from '../pages/adf/process_services/taskDetailsPage';
import { TaskFiltersDemoPage } from '../pages/adf/demo-shell/taskFiltersDemoPage';
import AlfrescoApi = require('alfresco-js-api-node');
import { AppsActions } from '../actions/APS/apps.actions';
@ -37,8 +37,8 @@ describe('Task Filters Sorting', () => {
let processServicesPage = new ProcessServicesPage();
let tasksPage = new TasksPage();
let tasksListPage = new TasksListPage();
let taskFiltersPage = new TaskFiltersPage();
let taskDetailsPage = new TaskDetailsPage();
let taskFiltersDemoPage = new TaskFiltersDemoPage();
let user;
let appId;
@ -119,7 +119,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Newest first');
taskFiltersDemoPage.customTaskFilter('Newest first').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[2].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name);
@ -142,7 +142,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Newest last');
taskFiltersDemoPage.customTaskFilter('Newest last').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[0].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name);
@ -164,7 +164,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Due first');
taskFiltersDemoPage.customTaskFilter('Due first').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[2].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name);
@ -186,7 +186,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Due last');
taskFiltersDemoPage.customTaskFilter('Due last').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[0].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[1].name);
@ -208,7 +208,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Newest first Open');
taskFiltersDemoPage.customTaskFilter('Newest first Open').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[5].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name);
@ -230,7 +230,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Newest last Open');
taskFiltersDemoPage.customTaskFilter('Newest last Open').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[3].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name);
@ -252,7 +252,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Due first Open');
taskFiltersDemoPage.customTaskFilter('Due first Open').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[5].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name);
@ -274,7 +274,7 @@ describe('Task Filters Sorting', () => {
browser.refresh();
taskFiltersPage.clickTaskFilter('Due last Open');
taskFiltersDemoPage.customTaskFilter('Due last Open').clickTaskFilter();
expect(tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[3].name);
expect(tasksListPage.getDataTable().contentInPosition(2)).toBe(tasks[4].name);