From 0513548d4dc510f8fbbf2ef5cc29cf4e5b83a770 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Wed, 27 Mar 2019 16:57:38 +0000
Subject: [PATCH] fix PS filter tests

---
 .../editTaskFilterCloudComponent.ts           |  2 +-
 .../edit-task-filters-component.e2e.ts        |  8 ++--
 .../task-list-properties.e2e.ts               | 38 +++++++++++++++----
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/e2e/pages/adf/process-cloud/editTaskFilterCloudComponent.ts b/e2e/pages/adf/process-cloud/editTaskFilterCloudComponent.ts
index 101bf49bcd..3fe046548f 100644
--- a/e2e/pages/adf/process-cloud/editTaskFilterCloudComponent.ts
+++ b/e2e/pages/adf/process-cloud/editTaskFilterCloudComponent.ts
@@ -180,7 +180,7 @@ export class EditTaskFilterCloudComponent {
     }
 
     clickSaveAsButton() {
-        let disabledButton = element(by.css(("button[id='adf-save-as-id'][disabled]")));
+        let disabledButton = element(by.css(("button[data-automation-id='adf-filter-action-saveAs'][disabled]")));
         Util.waitUntilElementIsClickable(this.saveAsButton);
         Util.waitUntilElementIsVisible(this.saveAsButton);
         Util.waitUntilElementIsNotVisible(disabledButton);
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 efcf177f36..711d28ba9a 100644
--- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts
+++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts
@@ -131,12 +131,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();
@@ -178,8 +178,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');
diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts
index 3428bc06b7..a3d6ac250f 100644
--- a/e2e/process-services-cloud/task-list-properties.e2e.ts
+++ b/e2e/process-services-cloud/task-list-properties.e2e.ts
@@ -81,14 +81,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();
 
             await tasksService.init(user, password);