inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into next-release-3.2.0

Browse Source
This commit is contained in:
Eugenio Romano
2019-03-29 16:17:03 +00:00
committed by Eugenio Romano
parent 1ecbf25030 3b53184598
commit b35fb4df93
120 changed files with 1583 additions and 13770 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/process-services-cloud/edit-task-filters-component.e2e.ts
+4 -4
View File
@@ -133,12 +133,12 @@ describe('Edit task filters cloud', () => {
expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader();
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id');
tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('PRIORITY');
tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('Priority');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton();
tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('New').clickOnSaveButton();
expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader();
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('PRIORITY');
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Priority');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton();
tasksCloudDemoPage.customTaskFilter('custom-new').clickTaskFilter();
tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed();
@@ -180,8 +180,8 @@ describe('Edit task filters cloud', () => {
it('[C291800] Task filter should not be created when task filter dialog is closed', () => {
tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('PRIORITY');
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('PRIORITY');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Priority');
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Priority');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton();
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().getFilterName()).toEqual('My Tasks');
tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('Cancel');
e2e/process-services-cloud/process-custom-filters.e2e.ts
+22 -5
View File
@@ -57,11 +57,28 @@ describe('Process list cloud', () => {
navigationBarPage.clickConfigEditorButton();
configEditorPage.clickEditProcessCloudConfiguration();
configEditorPage.clickClearButton();
configEditorPage.enterConfiguration('{' +
'"properties": [' +
'"appName",' + '"state",' + '"processInstanceId",' + '"sort",' + '"order"' +
']' +
'}');
configEditorPage.enterBigConfigurationText(`{
"filterProperties": [
"appName",
"status",
"processInstanceId",
"order",
"sort",
"order"
],
"sortProperties": [
"id",
"name",
"status",
"startDate"
],
"actions": [
"save",
"saveAs",
"delete"
]
}`);
configEditorPage.clickSaveButton();
const apiService = new ApiService('activiti', TestConfig.adf.url, TestConfig.adf.hostSso, 'BPM');
e2e/process-services-cloud/task-list-properties.e2e.ts
+30 -8
View File
@@ -78,14 +78,36 @@ describe('Edit task filters and task list properties', () => {
configEditorPage.clickEditTaskConfiguration();
configEditorPage.clickClearButton();
browser.driver.sleep(5000);
configEditorPage.enterConfiguration('{' +
'"properties": [' +
'"appName",' + '"status",' + '"assignee",' +
'"taskName",' + '"parentTaskId",' + '"priority",' +
'"standAlone",' + '"owner",' + '"processDefinitionId",' + '"processInstanceId",' +
'"lastModifiedFrom",' + '"lastModifiedTo",' + '"sort",' + '"order"' +
']' +
'}');
configEditorPage.enterBigConfigurationText(`{
"filterProperties": [
"appName",
"status",
"assignee",
"taskName",
"parentTaskId",
"priority",
"standAlone",
"owner",
"processDefinitionId",
"processInstanceId",
"lastModified",
"sort",
"order"
],
"sortProperties": [
"id",
"name",
"createdDate",
"priority",
"processDefinitionId"
],
"actions": [
"save",
"saveAs",
"delete"
]
}`);
configEditorPage.clickSaveButton();
const apiService = new ApiService('activiti', TestConfig.adf.url, TestConfig.adf.hostSso, 'BPM');