diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index e0492af721..d4e3b69ccb 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -155,15 +155,13 @@ describe('Process list cloud', () => { processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader() .setProcessInstanceId(completedProcess.entry.id); - processCloudDemoPage.processListCloudComponent().getDataTable().checkSpinnerIsDisplayed().checkSpinnerIsNotDisplayed(); - - expect(processCloudDemoPage.processListCloudComponent().getDataTable().numberOfRows()).toBe(1); - processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(completedProcess.entry.id); - processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('New').clickOnSaveButton(); expect(processCloudDemoPage.getActiveFilterName()).toBe('New'); + processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(completedProcess.entry.id); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().numberOfRows()).toBe(1); + processCloudDemoPage.editProcessFilterCloudComponent().clickCustomiseFilterHeader(); expect(processCloudDemoPage.editProcessFilterCloudComponent().getProcessInstanceId()).toEqual(completedProcess.entry.id); }); @@ -176,7 +174,6 @@ describe('Process list cloud', () => { processCloudDemoPage.editProcessFilterCloudComponent().setStatusFilterDropDown('RUNNING') .setAppNameDropDown(simpleApp).setProcessInstanceId(runningProcessInstance.entry.id); - processCloudDemoPage.processListCloudComponent().getDataTable().checkSpinnerIsDisplayed().checkSpinnerIsNotDisplayed(); processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(runningProcessInstance.entry.id); expect(processCloudDemoPage.editProcessFilterCloudComponent().getNumberOfAppNameOptions()).toBe(noOfApps); expect(processCloudDemoPage.editProcessFilterCloudComponent().checkAppNamesAreUnique()).toBe(true); @@ -192,7 +189,6 @@ describe('Process list cloud', () => { processCloudDemoPage.editProcessFilterCloudComponent().setStatusFilterDropDown('RUNNING') .setAppNameDropDown(simpleApp).setProcessInstanceId(switchProcessInstance.entry.id); - processCloudDemoPage.processListCloudComponent().getDataTable().checkSpinnerIsDisplayed().checkSpinnerIsNotDisplayed(); processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(switchProcessInstance.entry.id); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('SwitchFilter').clickOnSaveButton(); diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 0be178c55c..30a508265b 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-header-cloud.e2e.ts @@ -26,11 +26,13 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas import { ProcessHeaderCloudPage } from '@alfresco/adf-testing'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; +import { browser } from 'protractor'; + describe('Process Header cloud component', () => { describe('Process Header cloud component', () => { - const simpleApp = 'simple-app', subProcessApp = 'projectsubprocess'; + const simpleApp = 'simple-app', subProcessApp = 'subprocess-app'; const formatDate = 'DD-MM-YYYY'; const processHeaderCloudPage = new ProcessHeaderCloudPage(); @@ -53,6 +55,8 @@ describe('Process Header cloud component', () => { silentLogin = false; settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin); loginSSOPage.clickOnSSOButton(); + browser.ignoreSynchronization = true; + loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); @@ -66,7 +70,7 @@ describe('Process Header cloud component', () => { simpleApp, { name: StringUtil.generateRandomString(), businessKey: 'test' }); runningCreatedDate = moment(runningProcess.entry.startDate).format(formatDate); parentCompleteProcess = await processInstancesService.createProcessInstance(childProcessDefinition.list.entries[0].entry.key, - subProcessApp, { name: 'cris' }); + subProcessApp); queryService = new QueryService(apiService); @@ -120,7 +124,7 @@ describe('Process Header cloud component', () => { processCloudDemoPage.processListCloudComponent().selectRowById(childCompleteProcess.entry.id); expect(processHeaderCloudPage.getId()).toEqual(childCompleteProcess.entry.id); - expect(processHeaderCloudPage.getName()).toEqual(childCompleteProcess.entry.name); + expect(processHeaderCloudPage.getName()).toEqual(CONSTANTS.PROCESS_DETAILS.NO_NAME); expect(processHeaderCloudPage.getStatus()).toEqual(childCompleteProcess.entry.status); expect(processHeaderCloudPage.getInitiator()).toEqual(childCompleteProcess.entry.initiator); expect(processHeaderCloudPage.getStartDate()).toEqual(completedCreatedDate); diff --git a/e2e/process-services-cloud/processList-cloud-component.e2e.ts b/e2e/process-services-cloud/processList-cloud-component.e2e.ts index a9c4e2c2e6..14493237b4 100644 --- a/e2e/process-services-cloud/processList-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/processList-cloud-component.e2e.ts @@ -24,6 +24,8 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ConfigEditorPage } from '../pages/adf/configEditorPage'; import { ProcessListCloudConfiguration } from './processListCloud.config'; +import { browser } from 'protractor'; + describe('Process list cloud', () => { describe('Process List', () => { @@ -46,6 +48,8 @@ describe('Process list cloud', () => { silentLogin = false; settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin); loginSSOPage.clickOnSSOButton(); + browser.ignoreSynchronization = true; + loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); @@ -80,7 +84,7 @@ describe('Process list cloud', () => { it('[C291997] Should be able to change the default columns', async () => { - expect(processCloudDemoPage.processListCloudComponent().getDataTable().getNumberOfColumns()).toBe(13); + expect(processCloudDemoPage.processListCloudComponent().getDataTable().getNumberOfColumns()).toBe(12); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('id'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('name'); processCloudDemoPage.processListCloudComponent().getDataTable().checkColumnIsDisplayed('status'); diff --git a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts b/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts index be0709a98d..5c108df856 100644 --- a/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-custom-app-cloud.e2e.ts @@ -127,6 +127,7 @@ describe('Start Task', () => { it('[C291956] Should be able to create a new standalone task without assignee', () => { tasksCloudDemoPage.openNewTaskForm(); startTask.checkFormIsDisplayed(); + expect(peopleCloudComponent.getAssignee()).toContain('Admin', 'does not contain Admin'); startTask.clearField(peopleCloudComponent.peopleCloudSearch); startTask.addName(unassignedTaskName); startTask.clickStartButton(); diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index ddf77536a9..87655aace6 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -77,15 +77,14 @@ describe('Task filters cloud', () => { }); it('[C289955] Should display task in Complete Tasks List when task is completed', async () => { - const apiService = new ApiService('activiti', TestConfig.adf.url, TestConfig.adf.hostSso, 'BPM'); + const apiService = new ApiService('activiti', TestConfig.adf.hostBPM, TestConfig.adf.hostSso, 'BPM'); await apiService.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); tasksService = new TasksService(apiService); - const task = await tasksService.createStandaloneTask(completedTask, simpleApp); - - await tasksService.claimTask(task.entry.id, simpleApp); - await tasksService.completeTask(task.entry.id, simpleApp); + const toBeCompletedTask = await tasksService.createStandaloneTask(completedTask, simpleApp); + await tasksService.claimTask(toBeCompletedTask.entry.id, simpleApp); + await tasksService.completeTask(toBeCompletedTask.entry.id, simpleApp); tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); expect(tasksCloudDemoPage.getActiveFilterName()).toBe('My Tasks'); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index 129b9dcfdd..e519ff0119 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -31,7 +31,7 @@ describe('Task Header cloud component', () => { const basicCreatedTaskName = StringUtil.generateRandomString(), completedTaskName = StringUtil.generateRandomString(); let basicCreatedTask, basicCreatedDate, completedTask, completedCreatedDate, subTask, subTaskCreatedDate; const simpleApp = 'simple-app'; - const priority = 30, description = 'descriptionTask', formatDate = 'MMM DD YYYY'; + const priority = 30, description = 'descriptionTask', formatDate = 'DD-MM-YYYY'; const taskHeaderCloudPage = new TaskHeaderCloudPage(); diff --git a/e2e/util/constants.js b/e2e/util/constants.js index e937d2d668..f7bf434583 100644 --- a/e2e/util/constants.js +++ b/e2e/util/constants.js @@ -131,7 +131,8 @@ exports.PROCESS_DETAILS = { NO_PARENT: "None", NO_DATE: "No date", NO_BUSINESS_KEY: 'None', - NO_DESCRIPTION: 'No description' + NO_DESCRIPTION: 'No description', + NO_NAME: 'No name' }; exports.PROCESS_STATUS = { diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts index b683c0ddf2..423f6cd83b 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts @@ -178,7 +178,7 @@ export class EditProcessFilterCloudComponentPage { } clickSaveAsButton() { - const disabledButton = element(by.css(("button[id='adf-save-as-id'][disabled]"))); + const disabledButton = element(by.css(("button[data-automation-id='adf-filter-action-saveAs'][disabled]"))); BrowserVisibility.waitUntilElementIsClickable(this.saveAsButton); BrowserVisibility.waitUntilElementIsVisible(this.saveAsButton); BrowserVisibility.waitUntilElementIsNotVisible(disabledButton); diff --git a/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts index fc314e83e9..47ec6963ea 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts @@ -106,6 +106,7 @@ export class StartTasksCloudPage { clearField(locator) { BrowserVisibility.waitUntilElementIsVisible(locator); + BrowserVisibility.waitUntilElementIsClickable(locator); locator.getAttribute('value').then((result) => { for (let i = result.length; i >= 0; i--) { locator.sendKeys(protractor.Key.BACK_SPACE);