From 2138ce600ebd8d4ce2e9c09a057dea2549a00829 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Fri, 8 Nov 2019 15:57:19 +0200 Subject: [PATCH] Refactor e2e PS-CLOUD (#5224) * refactor cloud test * fix lint * fix ecm test * Update login-sso.page.ts * fix redirect --- .../apps-section-cloud.e2e.ts | 7 +------ .../edit-process-filters-component.e2e.ts | 8 +------- .../edit-task-filters-component.e2e.ts | 6 ------ .../form-field/date-widget.e2e.ts | 8 +------- .../form-field/dropdown-widget.e2e.ts | 7 ------- .../visibility-condition-tabs.e2e.ts | 9 ++------- .../form-field/visibility-condition.e2e.ts | 14 ++------------ .../people-group-cloud-component.e2e.ts | 8 +------- ...people-group-cloud-filter-component.e2e.ts | 8 +------- .../process-custom-filters.e2e.ts | 7 +------ .../process-filter-results.e2e.ts | 7 +------ .../process-filters-cloud.e2e.ts | 6 ------ .../process-header-cloud.e2e.ts | 8 ++------ .../process-list-cloud-action-menu.e2e.ts | 8 +------- .../process-list-cloud-component.e2e.ts | 8 +------- .../process-list-selection-cloud.e2e.ts | 7 +------ .../start-process-cloud.e2e.ts | 8 ++------ .../start-task-custom-app-cloud.e2e.ts | 7 ------- .../start-task/start-task-group-cloud.e2e.ts | 8 -------- .../task-filters-cloud.e2e.ts | 8 ++------ .../task-form-cloud-component.e2e.ts | 19 ++++++++----------- .../task-header-cloud.e2e.ts | 7 +------ .../task-list-cloud-action-menu.e2e.ts | 7 +------ .../task-list-properties.e2e.ts | 7 +------ .../task-list-selection.e2e.ts | 7 +------ .../tasks-custom-filters.e2e.ts | 7 +------ e2e/test.config.js | 5 +++++ .../src/lib/core/pages/login-sso.page.ts | 14 ++++++++++++++ scripts/app-config-replace.js | 13 +++++++------ .../travis/e2e/process-services-cloud-e2e.sh | 2 ++ 30 files changed, 61 insertions(+), 184 deletions(-) diff --git a/e2e/process-services-cloud/apps-section-cloud.e2e.ts b/e2e/process-services-cloud/apps-section-cloud.e2e.ts index 987d62a9ef..d161ed4b17 100644 --- a/e2e/process-services-cloud/apps-section-cloud.e2e.ts +++ b/e2e/process-services-cloud/apps-section-cloud.e2e.ts @@ -20,7 +20,6 @@ import { ApiService, IdentityService, LoginSSOPage, - SettingsPage, LocalStorageUtil, ApplicationsService } from '@alfresco/adf-testing'; @@ -31,7 +30,6 @@ describe('Applications list', () => { const loginSSOPage = new LoginSSOPage(); const navigationBarPage = new NavigationBarPage(); - const settingsPage = new SettingsPage(); const appListCloudPage = new AppListCloudPage(); const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; @@ -46,10 +44,7 @@ describe('Applications list', () => { await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); identityService = new IdentityService(apiService); testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER, identityService.ROLES.ACTIVITI_DEVOPS]); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); + await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password); applicationsService = new ApplicationsService(apiService); diff --git a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts index 54727ea033..9edfea37dd 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { ApiService, GroupIdentityService, IdentityService, LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; +import { ApiService, GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; @@ -30,7 +30,6 @@ describe('Edit process filters cloud', () => { const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); - const settingsPage = new SettingsPage(); const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; let identityService: IdentityService; @@ -46,12 +45,7 @@ describe('Edit process filters cloud', () => { groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); - }); afterAll(async () => { 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 b39a4d697f..12ef3ee2b1 100644 --- a/e2e/process-services-cloud/edit-task-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-task-filters-component.e2e.ts @@ -22,7 +22,6 @@ import { ApiService, LoginSSOPage, TasksService, - SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; @@ -36,7 +35,6 @@ describe('Edit task filters cloud', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); let tasksService: TasksService; let identityService: IdentityService; let groupIdentityService: GroupIdentityService; @@ -61,10 +59,6 @@ describe('Edit task filters cloud', () => { await tasksService.claimTask(assignedTask.entry.id, simpleApp); await tasksService.createAndCompleteTask(completedTaskName, simpleApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); diff --git a/e2e/process-services-cloud/form-field/date-widget.e2e.ts b/e2e/process-services-cloud/form-field/date-widget.e2e.ts index b4b47403ed..a3f128dac7 100644 --- a/e2e/process-services-cloud/form-field/date-widget.e2e.ts +++ b/e2e/process-services-cloud/form-field/date-widget.e2e.ts @@ -17,7 +17,6 @@ import { LoginSSOPage, - SettingsPage, Widget, BrowserActions, FormPage } from '@alfresco/adf-testing'; @@ -27,7 +26,6 @@ import { FormCloudDemoPage } from '../../pages/adf/demo-shell/process-services-c describe('Form Field Component - Dropdown Widget', () => { const loginSSOPage = new LoginSSOPage(); - const settingsPage = new SettingsPage(); const widget = new Widget(); const dateWidget = widget.dateWidget(); @@ -36,11 +34,7 @@ describe('Form Field Component - Dropdown Widget', () => { const formPage = new FormPage(); beforeAll(async () => { - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); - await loginSSOPage.loginSSOIdentityService(browser.params.identityUser.email, browser.params.identityUser.password); + await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); }); beforeEach(async () => { diff --git a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts index 7c6347f9e0..fe26c3b770 100644 --- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts +++ b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts @@ -22,7 +22,6 @@ import { ProcessInstancesService, LoginSSOPage, ApiService, - SettingsPage, IdentityService, GroupIdentityService, Widget, @@ -42,7 +41,6 @@ describe('Form Field Component - Dropdown Widget', () => { const tasksCloudDemoPage = new TasksCloudDemoPage(); const taskFormCloudComponent = new TaskFormCloudComponent(); const notificationHistoryPage = new NotificationHistoryPage(); - const settingsPage = new SettingsPage(); const taskHeaderCloudPage = new TaskHeaderCloudPage(); const widget = new Widget(); const dropdown = widget.dropdown(); @@ -88,12 +86,7 @@ describe('Form Field Component - Dropdown Widget', () => { tasksService = new TasksService(apiService); await tasksService.claimTask(task.entry.id, simpleApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); - }); afterAll(async () => { diff --git a/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts b/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts index 5b853ae447..15ba47e3df 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts +++ b/e2e/process-services-cloud/form-field/visibility-condition-tabs.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LoginSSOPage, SettingsPage, Widget } from '@alfresco/adf-testing'; +import { LoginSSOPage, Widget } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -27,7 +27,6 @@ import { tabFieldValueVisibilityJson, tabVarValueVisibilityJson, tabVarFieldVisi describe('Visibility conditions on tabs - cloud', () => { - const settingsPage = new SettingsPage(); const loginSSOPage = new LoginSSOPage(); const navigationBarPage = new NavigationBarPage(); @@ -61,11 +60,7 @@ describe('Visibility conditions on tabs - cloud', () => { hostBpm: browser.params.testConfig.adf_aps.host }); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); - await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); + await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); await navigationBarPage.navigateToFormCloudPage(); }); diff --git a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts index 613382606a..eee9575633 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts +++ b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LoginSSOPage, SettingsPage, Widget, AppListCloudPage, IdentityService, GroupIdentityService, ApiService, StringUtil, StartTasksCloudPage, TaskFormCloudComponent } from '@alfresco/adf-testing'; +import { LoginSSOPage, Widget, AppListCloudPage, IdentityService, GroupIdentityService, ApiService, StringUtil, StartTasksCloudPage, TaskFormCloudComponent } from '@alfresco/adf-testing'; import { browser, by } from 'protractor'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; @@ -31,7 +31,6 @@ import { ProcessDetailsCloudDemoPage } from '../../pages/adf/demo-shell/process- describe('Visibility conditions - cloud', () => { - const settingsPage = new SettingsPage(); const loginSSOPage = new LoginSSOPage(); const navigationBarPage = new NavigationBarPage(); @@ -69,11 +68,7 @@ describe('Visibility conditions - cloud', () => { hostBpm: browser.params.testConfig.adf_aps.host }); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); - await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); + await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); await navigationBarPage.navigateToFormCloudPage(); @@ -260,7 +255,6 @@ describe('Task cloud visibility', async () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); const startTask = new StartTasksCloudPage(); const taskFormCloudComponent = new TaskFormCloudComponent(); const startProcessPage = new StartProcessPage(); @@ -283,10 +277,6 @@ describe('Task cloud visibility', async () => { groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); 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 425d95e07f..f6ff1acd81 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts @@ -17,7 +17,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; -import { GroupCloudComponentPage, PeopleCloudComponentPage, SettingsPage } from '@alfresco/adf-testing'; +import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { LoginSSOPage, IdentityService, GroupIdentityService, RolesService, ApiService } from '@alfresco/adf-testing'; @@ -32,7 +32,6 @@ describe('People Groups Cloud Component', () => { let identityService: IdentityService; let groupIdentityService: GroupIdentityService; let rolesService: RolesService; - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -77,12 +76,7 @@ describe('People Groups Cloud Component', () => { users = [`${apsUser.idIdentityService}`, `${activitiUser.idIdentityService}`, `${noRoleUser.idIdentityService}`, `${testUser.idIdentityService}`]; groups = [`${groupUser.id}`, `${groupAdmin.id}`, `${groupNoRole.id}`]; - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); - }); afterAll(async () => { diff --git a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts index 55ecd7027e..48c80f8017 100644 --- a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts @@ -17,7 +17,7 @@ import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; -import { GroupCloudComponentPage, PeopleCloudComponentPage, SettingsPage } from '@alfresco/adf-testing'; +import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { LoginSSOPage, IdentityService, GroupIdentityService, ApiService } from '@alfresco/adf-testing'; @@ -29,7 +29,6 @@ describe('People Groups Cloud Component', () => { const peopleGroupCloudComponentPage = new PeopleGroupCloudComponentPage(); const peopleCloudComponent = new PeopleCloudComponentPage(); const groupCloudComponentPage = new GroupCloudComponentPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -62,12 +61,7 @@ describe('People Groups Cloud Component', () => { users = [apsUser.idIdentityService, noRoleUser.idIdentityService, testUser.idIdentityService]; - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(apsUser.email, apsUser.password); - }); afterAll(async () => { diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index 071294d2bf..f89faa16d7 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -17,7 +17,7 @@ import { TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, - LoginSSOPage, ApiService, SettingsPage, IdentityService, GroupIdentityService, StringUtil + LoginSSOPage, ApiService, IdentityService, GroupIdentityService, StringUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; @@ -35,7 +35,6 @@ describe('Process list cloud', () => { const appListCloudComponent = new AppListCloudPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -104,10 +103,6 @@ describe('Process list cloud', () => { const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); await tasksService.completeTask(claimedTask.entry.id, candidateBaseApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify(editProcessFilterConfigFile)); await LocalStorageUtil.setConfigField('adf-cloud-process-list', JSON.stringify(processListCloudConfigFile)); diff --git a/e2e/process-services-cloud/process-filter-results.e2e.ts b/e2e/process-services-cloud/process-filter-results.e2e.ts index 96d9efce52..02abcf6c1b 100644 --- a/e2e/process-services-cloud/process-filter-results.e2e.ts +++ b/e2e/process-services-cloud/process-filter-results.e2e.ts @@ -17,7 +17,7 @@ import { TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, - LoginSSOPage, ApiService, SettingsPage, IdentityService, GroupIdentityService, StringUtil, DateUtil + LoginSSOPage, ApiService, IdentityService, GroupIdentityService, StringUtil, DateUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; @@ -36,7 +36,6 @@ describe('Process filters cloud', () => { const processCloudDemoPage = new ProcessCloudDemoPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); const processListPage = new ProcessListPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -121,10 +120,6 @@ describe('Process filters cloud', () => { const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); await tasksService.completeTask(claimedTask.entry.id, candidateBaseApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); await LocalStorageUtil.setConfigField('adf-edit-process-filter', JSON.stringify(editProcessFilterConfigFile)); await LocalStorageUtil.setConfigField('adf-cloud-process-list', JSON.stringify(processListCloudConfigFile)); diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index 1a7ae68a3d..ce6698c60f 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts @@ -23,7 +23,6 @@ import { ProcessInstancesService, LoginSSOPage, ApiService, - SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; @@ -40,7 +39,6 @@ describe('Process filters cloud', () => { const appListCloudComponent = new AppListCloudPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -82,10 +80,6 @@ describe('Process filters cloud', () => { const claimedTask = await tasksService.claimTask(task.list.entries[0].entry.id, candidateBaseApp); await tasksService.completeTask(claimedTask.entry.id, candidateBaseApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }, 5 * 60 * 1000); diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 7ffc3ccc80..7e59a4aa16 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-header-cloud.e2e.ts @@ -27,7 +27,6 @@ import { ProcessDefinitionsService, ProcessInstancesService, QueryService, - SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; @@ -51,7 +50,6 @@ describe('Process Header cloud component', () => { const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -71,12 +69,14 @@ describe('Process Header cloud component', () => { await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); identityService = new IdentityService(apiService); groupIdentityService = new GroupIdentityService(apiService); + testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); await apiService.login(testUser.email, testUser.password); processDefinitionService = new ProcessDefinitionsService(apiService); + const processDefinition = await processDefinitionService.getProcessDefinitions(simpleApp); const childProcessDefinition = await processDefinitionService.getProcessDefinitions(subProcessApp); @@ -94,10 +94,6 @@ describe('Process Header cloud component', () => { childCompleteProcess = parentProcessInstance.list.entries[0]; completedCreatedDate = moment(childCompleteProcess.entry.startDate).format(formatDate); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); diff --git a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts index c5691a018d..bbd9af4213 100644 --- a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts +++ b/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { GroupIdentityService, IdentityService, LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; +import { GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -32,7 +32,6 @@ describe('Process list cloud', () => { const appListCloudComponent = new AppListCloudPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); let processDefinitionService: ProcessDefinitionsService; let processInstancesService: ProcessInstancesService; @@ -61,12 +60,7 @@ describe('Process list cloud', () => { editProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); deleteProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, simpleApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); - }); afterAll(async() => { diff --git a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts index 87f3396b29..7bcd6a7e7b 100644 --- a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts @@ -22,7 +22,7 @@ import { LoginSSOPage, ApiService, LocalStorageUtil, - SettingsPage, IdentityService, GroupIdentityService + IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; @@ -36,7 +36,6 @@ describe('Process list cloud', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, 'BPM'); let processDefinitionService: ProcessDefinitionsService; @@ -66,12 +65,7 @@ describe('Process list cloud', () => { processInstancesService = new ProcessInstancesService(apiService); runningProcess = await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); - }); afterAll(async () => { diff --git a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts index 0e9e1a8d22..9c6d06790a 100644 --- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { GroupIdentityService, IdentityService, LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; +import { GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing'; import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -32,7 +32,6 @@ describe('Process list cloud', () => { const appListCloudComponent = new AppListCloudPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); let processDefinitionService: ProcessDefinitionsService; let processInstancesService: ProcessInstancesService; @@ -65,10 +64,6 @@ describe('Process list cloud', () => { processInstances.push(response.entry.id); } - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); diff --git a/e2e/process-services-cloud/start-process-cloud.e2e.ts b/e2e/process-services-cloud/start-process-cloud.e2e.ts index 69df74d619..004e735792 100644 --- a/e2e/process-services-cloud/start-process-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-process-cloud.e2e.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ApiService, GroupIdentityService, IdentityService, LoginSSOPage, SettingsPage } from '@alfresco/adf-testing'; +import { ApiService, GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing'; import { AppListCloudPage, StartProcessCloudPage } from '@alfresco/adf-testing'; import { browser, protractor } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -29,7 +29,6 @@ describe('Start Process', () => { const appListCloudComponent = new AppListCloudPage(); const processCloudDemoPage = new ProcessCloudDemoPage(); const startProcessPage = new StartProcessCloudPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -52,10 +51,7 @@ describe('Start Process', () => { testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); + await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); await navigationBarPage.navigateToProcessServicesCloudPage(); diff --git a/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts b/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts index 717a647671..cf3566a3eb 100644 --- a/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task/start-task-custom-app-cloud.e2e.ts @@ -28,7 +28,6 @@ import { TasksService, ApiService, IdentityService, - SettingsPage, GroupIdentityService } from '@alfresco/adf-testing'; @@ -41,7 +40,6 @@ describe('Start Task', () => { const tasksCloudDemoPage = new TasksCloudDemoPage(); const startTask = new StartTasksCloudPage(); const peopleCloudComponent = new PeopleCloudComponentPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -75,12 +73,7 @@ describe('Start Task', () => { await identityService.addUserToGroup(apsUser.idIdentityService, groupInfo.id); await apiService.login(testUser.email, testUser.password); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); - }); afterAll(async () => { diff --git a/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts b/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts index 311ddf3c09..389e574bb9 100644 --- a/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task/start-task-group-cloud.e2e.ts @@ -28,7 +28,6 @@ import { TasksService, ApiService, IdentityService, - SettingsPage, GroupIdentityService, RolesService } from '@alfresco/adf-testing'; @@ -40,7 +39,6 @@ describe('Start Task - Group Cloud Component', () => { const tasksCloudDemoPage = new TasksCloudDemoPage(); const startTask = new StartTasksCloudPage(); const peopleCloudComponent = new PeopleCloudComponentPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -72,12 +70,6 @@ describe('Start Task - Group Cloud Component', () => { await identityService.addUserToGroup(testUser.idIdentityService, testGroup.id); await identityService.addUserToGroup(apsUser.idIdentityService, hrGroup.id); - - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); - }); afterAll(async () => { diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index db7c5b2664..400125d95d 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil, SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; +import { LoginSSOPage, TasksService, ApiService, AppListCloudPage, StringUtil, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; @@ -27,7 +27,6 @@ describe('Task filters cloud', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); let tasksService: TasksService; let identityService: IdentityService; let groupIdentityService: GroupIdentityService; @@ -47,10 +46,7 @@ describe('Task filters cloud', () => { await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); await apiService.login(testUser.email, testUser.password); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); + await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); diff --git a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts index 35edfe12c1..ef5422c82b 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts @@ -24,7 +24,6 @@ import { TasksService, ProcessDefinitionsService, ProcessInstancesService, - SettingsPage, TaskHeaderCloudPage, TaskFormCloudComponent, Widget, IdentityService, GroupIdentityService, QueryService @@ -41,7 +40,6 @@ describe('Task form cloud component', () => { const tasksCloudDemoPage = new TasksCloudDemoPage(); const taskHeaderCloudPage = new TaskHeaderCloudPage(); const taskFormCloudComponent = new TaskFormCloudComponent(); - const settingsPage = new SettingsPage(); const widget = new Widget(); const formToTestValidationsKey = 'form-49904910-603c-48e9-8c8c-1d442c0fa524'; @@ -55,6 +53,7 @@ describe('Task form cloud component', () => { const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; const completedTaskName = StringUtil.generateRandomString(), assignedTaskName = StringUtil.generateRandomString(); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers); + const apiServiceHrUser = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers); const visibilityConditionTasks = []; @@ -87,7 +86,9 @@ describe('Task form cloud component', () => { identityService = new IdentityService(apiService); const groupIdentityService = new GroupIdentityService(apiService); - const formCloudService = new FormCloudService(apiService); + + await apiServiceHrUser.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + const formCloudService = new FormCloudService(apiServiceHrUser); testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]); @@ -95,8 +96,8 @@ describe('Task form cloud component', () => { await identityService.addUserToGroup(testUser.idIdentityService, groupInfo.id); await apiService.login(testUser.email, testUser.password); - tasksService = new TasksService(apiService); - const queryService = new QueryService(apiService); + tasksService = new TasksService(apiServiceHrUser); + const queryService = new QueryService(apiServiceHrUser); createdTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateBaseApp); assigneeTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateBaseApp); @@ -128,12 +129,12 @@ describe('Task form cloud component', () => { await tasksService.claimTask(completedTask.entry.id, candidateBaseApp); await tasksService.createAndCompleteTask(completedTaskName, candidateBaseApp); - processDefinitionService = new ProcessDefinitionsService(apiService); + processDefinitionService = new ProcessDefinitionsService(apiServiceHrUser); let processDefinition = await processDefinitionService .getProcessDefinitionByName(browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP.processes.candidateUserProcess, candidateBaseApp); - processInstancesService = new ProcessInstancesService(apiService); + processInstancesService = new ProcessInstancesService(apiServiceHrUser); await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateBaseApp); processDefinition = await processDefinitionService.getProcessDefinitionByName('dropdownrestprocess', simpleApp); @@ -141,10 +142,6 @@ describe('Task form cloud component', () => { const formTasks = await queryService.getProcessInstanceTasks(formProcess.entry.id, simpleApp); formTaskId = formTasks.list.entries[0].entry.id; - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }, 5 * 60 * 1000); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index bdf27f6f3e..90264f1a32 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -16,7 +16,7 @@ */ import CONSTANTS = require('../util/constants'); -import { ApiService, StringUtil, SettingsPage, IdentityService, GroupIdentityService, LocalStorageUtil } from '@alfresco/adf-testing'; +import { ApiService, StringUtil, IdentityService, GroupIdentityService, LocalStorageUtil } from '@alfresco/adf-testing'; import moment = require('moment'); import { browser } from 'protractor'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; @@ -47,7 +47,6 @@ describe('Task Header cloud component', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers); let tasksService: TasksService; let identityService: IdentityService; @@ -84,10 +83,6 @@ describe('Task Header cloud component', () => { subTask = await tasksService.getTask(subTaskId.entry.id, simpleApp); subTaskCreatedDate = moment(subTask.entry.createdDate).format(formatDate); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); diff --git a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts index ec5245bf7b..ae33d885c5 100644 --- a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts +++ b/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts @@ -16,7 +16,7 @@ */ import { browser } from 'protractor'; -import { GroupIdentityService, IdentityService, LoginSSOPage, QueryService, SettingsPage, TasksService } from '@alfresco/adf-testing'; +import { GroupIdentityService, IdentityService, LoginSSOPage, QueryService, TasksService } from '@alfresco/adf-testing'; import { AppListCloudPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; @@ -31,7 +31,6 @@ describe('Process list cloud', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); let processDefinitionService: ProcessDefinitionsService; let processInstancesService: ProcessInstancesService; @@ -69,10 +68,6 @@ describe('Process list cloud', () => { await tasksService.claimTask(editTask.list.entries[0].entry.id, simpleApp); await tasksService.claimTask(deleteTask.list.entries[0].entry.id, simpleApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 4b3aa08de1..228452f778 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -20,7 +20,7 @@ import { StringUtil, TasksService, ProcessDefinitionsService, ProcessInstancesService, LoginSSOPage, ApiService, - AppListCloudPage, LocalStorageUtil, IdentityService, SettingsPage, GroupIdentityService, DateUtil + AppListCloudPage, LocalStorageUtil, IdentityService, GroupIdentityService, DateUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; @@ -59,7 +59,6 @@ describe('Edit task filters and task list properties', () => { identityService = new IdentityService(apiService); groupIdentityService = new GroupIdentityService(apiService); tasksService = new TasksService(apiService); - const settingsPage = new SettingsPage(); testUser = await identityService.createIdentityUserWithRole(apiService, [identityService.ROLES.ACTIVITI_USER]); @@ -93,10 +92,6 @@ describe('Edit task filters and task list properties', () => { const jsonFile = new TaskListCloudConfiguration().getConfiguration(); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); await LocalStorageUtil.setConfigField('adf-cloud-task-list', JSON.stringify(jsonFile)); await LocalStorageUtil.setConfigField('adf-edit-task-filter', JSON.stringify({ diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index 58f3794bd8..0c102777a6 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/e2e/process-services-cloud/task-list-selection.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { ApiService, LoginSSOPage, TasksService, SettingsPage, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; +import { ApiService, LoginSSOPage, TasksService, IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { AppListCloudPage } from '@alfresco/adf-testing'; @@ -30,7 +30,6 @@ describe('Task list cloud - selection', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -63,10 +62,6 @@ describe('Task list cloud - selection', () => { tasks.push(response.entry.name); } - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }); diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index b246f57901..823627f85d 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -25,7 +25,7 @@ import { ProcessInstancesService, LoginSSOPage, ApiService, - SettingsPage, IdentityService, GroupIdentityService + IdentityService, GroupIdentityService } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; @@ -38,7 +38,6 @@ describe('Task filters cloud', () => { const navigationBarPage = new NavigationBarPage(); const appListCloudComponent = new AppListCloudPage(); const tasksCloudDemoPage = new TasksCloudDemoPage(); - const settingsPage = new SettingsPage(); const apiService = new ApiService( browser.params.config.oauth2.clientId, browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.providers @@ -98,10 +97,6 @@ describe('Task filters cloud', () => { await processInstancesService.deleteProcessInstance(secondProcessInstance.entry.id, simpleApp); await queryService.getProcessInstanceTasks(processInstance.entry.id, simpleApp); - await settingsPage.setProviderBpmSso( - browser.params.config.bpmHost, - browser.params.config.oauth2.host, - browser.params.config.identityHost); await loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); }, 5 * 60 * 1000); diff --git a/e2e/test.config.js b/e2e/test.config.js index 75b9126fa9..7cb3059105 100644 --- a/e2e/test.config.js +++ b/e2e/test.config.js @@ -75,6 +75,11 @@ module.exports = { password: PASSWORD_ADF }, + hrUser: { + email: process.env.HR_USER, + password: process.env.HR_USER_PASSWORD + }, + adf: { /** * base diff --git a/lib/testing/src/lib/core/pages/login-sso.page.ts b/lib/testing/src/lib/core/pages/login-sso.page.ts index cb9d23467d..aa3c09b1a1 100644 --- a/lib/testing/src/lib/core/pages/login-sso.page.ts +++ b/lib/testing/src/lib/core/pages/login-sso.page.ts @@ -21,6 +21,7 @@ import { BrowserActions } from '../utils/browser-actions'; export class LoginSSOPage { + loginURL: string = browser.baseUrl + '/login'; ssoButton = element(by.css(`[data-automation-id="login-button-sso"]`)); usernameField = element(by.id('username')); passwordField = element(by.id('password')); @@ -30,12 +31,25 @@ export class LoginSSOPage { async loginSSOIdentityService(username, password) { browser.ignoreSynchronization = true; + + let currentUrl; + + try { + currentUrl = await browser.getCurrentUrl(); + } catch (e) { + } + + if (!currentUrl || currentUrl === '' || currentUrl === 'data:,') { + await browser.get(this.loginURL); + } + await BrowserVisibility.waitUntilElementIsVisible(this.usernameField); await this.enterUsername(username); await this.enterPassword(password); await this.clickLoginButton(); await browser.actions().sendKeys(protractor.Key.ENTER).perform(); await BrowserVisibility.waitUntilElementIsVisible(this.header); + await browser.waitForAngular(); } diff --git a/scripts/app-config-replace.js b/scripts/app-config-replace.js index 4128d2c78d..48b1ab0d32 100644 --- a/scripts/app-config-replace.js +++ b/scripts/app-config-replace.js @@ -4,17 +4,18 @@ require('dotenv').config({ path: process.env.ENV_FILE }); const fs = require('fs'); -const PROXY_HOST_ADF = process.env.PROXY_HOST_ADF; -const NOTIFICATION_LAST = process.env.NOTIFICATION_LAST || 8000; - const configPath = './demo-shell/dist/app.config.json'; fs.readFile(configPath, (err, appConfigString) => { if (err) throw err; let appConfig = JSON.parse(appConfigString); - appConfig.bpmHost = PROXY_HOST_ADF; - appConfig.ecmHost = PROXY_HOST_ADF; - appConfig.notificationDefaultDuration = NOTIFICATION_LAST; + appConfig.providers = process.env.PROVIDERS; + appConfig.bpmHost = process.env.PROXY_HOST_ADF; + appConfig.ecmHost = process.env.PROXY_HOST_ADF; + appConfig.identityHost = process.env.URL_HOST_IDENTITY; + appConfig.oauth2.host = process.env.URL_HOST_SSO_ADF; + appConfig.notificationDefaultDuration = process.env.NOTIFICATION_LAST || 8000; + appConfig.authType = process.env.AUTH_TYPE || 'BASIC'; let appConfigReplacedJson = JSON.stringify(appConfig); fs.writeFileSync(configPath, appConfigReplacedJson); diff --git a/scripts/travis/e2e/process-services-cloud-e2e.sh b/scripts/travis/e2e/process-services-cloud-e2e.sh index 384b475fd9..4e2b6bc4c5 100755 --- a/scripts/travis/e2e/process-services-cloud-e2e.sh +++ b/scripts/travis/e2e/process-services-cloud-e2e.sh @@ -5,6 +5,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ CONTEXT_ENV="process-services-cloud" +export PROVIDERS="BPMN" +export AUTH_TYPE="OAUTH" ./scripts/git-util/check-branch-updated.sh -b $TRAVIS_BRANCH || exit 1;