From 83c1e8a657302a082634819465b38bace5929ce0 Mon Sep 17 00:00:00 2001 From: cristinaj Date: Tue, 2 Apr 2019 23:30:47 +0300 Subject: [PATCH] [ADF-4344]Fix e2e cloud tests. (#4542) * Fix e2e cloud tests. * no message --- .../edit-task-filters-component.e2e.ts | 2 +- .../people-group-cloud-component.e2e.ts | 2 +- e2e/process-services-cloud/process-custom-filters.e2e.ts | 2 +- e2e/process-services-cloud/process-filters-cloud.e2e.ts | 2 +- e2e/process-services-cloud/process-header-cloud.e2e.ts | 2 +- .../processList-cloud-component.e2e.ts | 2 +- e2e/process-services-cloud/task-filters-cloud.e2e.ts | 2 +- e2e/process-services-cloud/task-header-cloud.e2e.ts | 2 +- e2e/process-services-cloud/task-list-properties.e2e.ts | 2 +- e2e/process-services-cloud/task-list-selection.e2e.ts | 2 +- e2e/process-services-cloud/tasks-custom-filters.e2e.ts | 2 +- e2e/process-services/people-component.e2e.ts | 5 ----- 12 files changed, 11 insertions(+), 16 deletions(-) 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 8c8a1979a8..52044c65a1 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts @@ -48,7 +48,7 @@ describe('Edit task filters cloud', () => { browser.ignoreSynchronization = true; loginSSOPage.loginSSOIdentityService(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); - 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); diff --git a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts index 82f22adcf5..87d419dbef 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts @@ -54,7 +54,7 @@ describe('People Groups Cloud Component', () => { beforeAll(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); identityService = new IdentityService(apiService); rolesService = new RolesService(apiService); diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index b895bf7ac0..7ca680049b 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -81,7 +81,7 @@ describe('Process list cloud', () => { configEditorPage.clickSaveButton(); - 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); processDefinitionService = new ProcessDefinitionsService(apiService); diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index 0b9ff8b3fb..e1267ff873 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts @@ -53,7 +53,7 @@ describe('Process filters cloud', () => { browser.ignoreSynchronization = true; loginSSOPage.loginSSOIdentityService(user, password); - 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); processDefinitionService = new ProcessDefinitionsService(apiService); diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 4cbe018c96..05235d23cb 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-header-cloud.e2e.ts @@ -55,7 +55,7 @@ describe('Process Header cloud component', () => { settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin); loginSSOPage.clickOnSSOButton(); - 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); processDefinitionService = new ProcessDefinitionsService(apiService); diff --git a/e2e/process-services-cloud/processList-cloud-component.e2e.ts b/e2e/process-services-cloud/processList-cloud-component.e2e.ts index aa0499f6c3..83a5a8b5c2 100644 --- a/e2e/process-services-cloud/processList-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/processList-cloud-component.e2e.ts @@ -48,7 +48,7 @@ describe('Process list cloud', () => { settingsPage.setProviderBpmSso(TestConfig.adf.hostBPM, TestConfig.adf.hostSso, TestConfig.adf.hostIdentity, silentLogin); loginSSOPage.clickOnSSOButton(); - 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); processDefinitionService = new ProcessDefinitionsService(apiService); diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index 51f7e21664..040e55bc24 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -61,7 +61,7 @@ describe('Task filters cloud', () => { }); it('[C290009] Should display default filters and created task', 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); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index 7283102ef5..0d119ae704 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -54,7 +54,7 @@ describe('Task Header cloud component', () => { browser.ignoreSynchronization = true; loginSSOPage.loginSSOIdentityService(user, password); - 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); diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 8965ab39be..c3b60c7e2d 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -110,7 +110,7 @@ describe('Edit task filters and task list properties', () => { configEditorPage.clickSaveButton(); - 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); diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index 9ba734b21c..c896aecf13 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/e2e/process-services-cloud/task-list-selection.e2e.ts @@ -50,7 +50,7 @@ describe('Task list cloud - selection', () => { browser.ignoreSynchronization = true; loginSSOPage.loginSSOIdentityService(user, password); - 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); diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index aa2d9d5396..add10d114e 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -55,7 +55,7 @@ describe('Task filters cloud', () => { browser.ignoreSynchronization = true; loginSSOPage.loginSSOIdentityService(user, password); - 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); diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index cb9f11c0e7..b99b0f854e 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -180,8 +180,6 @@ describe('People component', () => { expect(taskPage.taskDetails().getInvolvedUserEmail(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)) .toEqual(assigneeUserModel.email); - expect(taskPage.taskDetails().getInvolvedUserEditAction(assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName)) - .toEqual('can edit'); expect(taskPage.taskDetails().getInvolvedPeopleTitle()).toEqual(peopleTitle + '(1)'); taskPage.taskDetails().clickInvolvePeopleButton() @@ -192,9 +190,6 @@ describe('People component', () => { expect(taskPage.taskDetails().getInvolvedUserEmail(secondAssigneeUserModel.firstName + ' ' + secondAssigneeUserModel.lastName)) .toEqual(secondAssigneeUserModel.email); - - expect(taskPage.taskDetails().getInvolvedUserEditAction(secondAssigneeUserModel.firstName + ' ' + secondAssigneeUserModel.lastName)) - .toEqual('can edit'); expect(taskPage.taskDetails().getInvolvedPeopleTitle()).toEqual(peopleTitle + '(2)'); });