fix PS filter tests

This commit is contained in:
Eugenio Romano 2019-03-27 16:57:38 +00:00
parent 49dab5d030
commit 0513548d4d
3 changed files with 35 additions and 13 deletions

View File

@ -180,7 +180,7 @@ export class EditTaskFilterCloudComponent {
} }
clickSaveAsButton() { 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.waitUntilElementIsClickable(this.saveAsButton);
Util.waitUntilElementIsVisible(this.saveAsButton); Util.waitUntilElementIsVisible(this.saveAsButton);
Util.waitUntilElementIsNotVisible(disabledButton); Util.waitUntilElementIsNotVisible(disabledButton);

View File

@ -131,12 +131,12 @@ describe('Edit task filters cloud', () => {
expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New'); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader();
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Id');
tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('PRIORITY'); tasksCloudDemoPage.editTaskFilterCloudComponent().setSortFilterDropDown('Priority');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton();
tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('New').clickOnSaveButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('New').clickOnSaveButton();
expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New'); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('New');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader();
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('PRIORITY'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Priority');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickDeleteButton();
tasksCloudDemoPage.customTaskFilter('custom-new').clickTaskFilter(); tasksCloudDemoPage.customTaskFilter('custom-new').clickTaskFilter();
tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed(); 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', () => { it('[C291800] Task filter should not be created when task filter dialog is closed', () => {
tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('PRIORITY'); tasksCloudDemoPage.editTaskFilterCloudComponent().clickCustomiseFilterHeader().setSortFilterDropDown('Priority');
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('PRIORITY'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().getSortFilterDropDownValue()).toEqual('Priority');
tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton(); tasksCloudDemoPage.editTaskFilterCloudComponent().clickSaveAsButton();
expect(tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().getFilterName()).toEqual('My Tasks'); expect(tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().getFilterName()).toEqual('My Tasks');
tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('Cancel'); tasksCloudDemoPage.editTaskFilterCloudComponent().editTaskFilterDialog().setFilterName('Cancel');

View File

@ -81,14 +81,36 @@ describe('Edit task filters and task list properties', () => {
configEditorPage.clickEditTaskConfiguration(); configEditorPage.clickEditTaskConfiguration();
configEditorPage.clickClearButton(); configEditorPage.clickClearButton();
browser.driver.sleep(5000); browser.driver.sleep(5000);
configEditorPage.enterConfiguration('{' + configEditorPage.enterBigConfigurationText(`{
'"properties": [' + "filterProperties": [
'"appName",' + '"status",' + '"assignee",' + "appName",
'"taskName",' + '"parentTaskId",' + '"priority",' + "status",
'"standAlone",' + '"owner",' + '"processDefinitionId",' + '"processInstanceId",' + "assignee",
'"lastModifiedFrom",' + '"lastModifiedTo",' + '"sort",' + '"order"' + "taskName",
']' + "parentTaskId",
'}'); "priority",
"standAlone",
"owner",
"processDefinitionId",
"processInstanceId",
"lastModified",
"sort",
"order"
],
"sortProperties": [
"id",
"name",
"createdDate",
"priority",
"processDefinitionId"
],
"actions": [
"save",
"saveAs",
"delete"
]
}`);
configEditorPage.clickSaveButton(); configEditorPage.clickSaveButton();
await tasksService.init(user, password); await tasksService.init(user, password);