From fca378a12b97fdf59966a568ce6eba02d53d1459 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 26 Oct 2020 17:46:54 +0000 Subject: [PATCH] move users in the users object to make loginWithProgile general purpose (#6270) * move users in the users object to make loginWithProgile general puropose * add loginProfile in login page too * fix * fix * fix * fix * fix * fix * more fix * fix * fix * fix * change * fix script * fix --- .../metadata/metadata-smoke-tests.e2e.ts | 2 +- .../sso-download-directive-component.e2e.ts | 2 +- e2e/core/login/login-component.e2e.ts | 16 +++++----- e2e/core/login/login-sso/login-sso.e2e.ts | 8 ++--- e2e/core/login/login-sso/logout-sso.e2e.ts | 2 +- e2e/core/pages/login-shell.page.ts | 4 +++ e2e/core/settings-component.e2e.ts | 20 ++++++------ e2e/core/user-info-component-cloud.e2e.ts | 2 +- ...ut-process-services-cloud.component.e2e.ts | 5 ++- .../apps-section-cloud.e2e.ts | 4 +-- .../edit-process-filters-component.e2e.ts | 4 +-- .../edit-task-filters-component.e2e.ts | 4 +-- .../form-field/dropdown-widget.e2e.ts | 4 +-- .../form-field/people-group-of-people.e2e.ts | 3 +- .../task-visibility-condition.e2e.ts | 4 +-- .../visibility-condition-tabs.e2e.ts | 3 +- .../form-field/visibility-condition.e2e.ts | 3 +- .../people-group-cloud-component.e2e.ts | 4 +-- ...people-group-cloud-filter-component.e2e.ts | 4 +-- .../process-custom-filters.e2e.ts | 4 +-- .../process-filter-results.e2e.ts | 4 +-- .../process-filter-task.e2e.ts | 4 +-- .../process-filters-cloud.e2e.ts | 4 +-- .../process-header-cloud.e2e.ts | 4 +-- .../process-list-cloud-action-menu.e2e.ts | 4 +-- .../process-list-selection-cloud.e2e.ts | 4 +-- ...cess-task-attach-content-file-cloud.e2e.ts | 4 +-- .../start-process-cloud.e2e.ts | 4 +-- .../start-task-form-cloud.e2e.ts | 4 +-- .../start-task-custom-app-cloud.e2e.ts | 4 +-- .../start-task/start-task-group-cloud.e2e.ts | 4 +-- .../task-filters-cloud.e2e.ts | 4 +-- .../task-form-cloud-component-tab.e2e.ts | 4 +-- .../task-form-cloud-component.e2e.ts | 4 +-- .../task-header-cloud.e2e.ts | 4 +-- .../task-list-cloud-action-menu.e2e.ts | 4 +-- .../task-list-properties-sort.e2e.ts | 4 +-- .../task-list-properties.e2e.ts | 4 +-- .../task-list-selection.e2e.ts | 4 +-- .../tasks-claim-release.e2e.ts | 20 ++++++------ .../tasks-custom-filters.e2e.ts | 4 +-- .../attach-file-content-service.e2e.ts | 8 ++--- .../start-process-component.e2e.ts | 2 +- e2e/protractor/save-remote.js | 2 +- .../components/search-check-list.e2e.ts | 2 +- .../components/search-date-range.e2e.ts | 2 +- e2e/search/search-page.e2e.ts | 2 +- e2e/test.config.js | 32 +++++++++++-------- .../src/lib/core/actions/api.service.ts | 4 +-- .../src/lib/core/actions/users.actions.ts | 2 +- lib/testing/src/lib/core/pages/login.page.ts | 9 ++++++ 51 files changed, 140 insertions(+), 127 deletions(-) diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index bf9604d5c2..0b7a77f76e 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -262,7 +262,7 @@ describe('Metadata component', () => { }); it('[C279960] Should show the last username modifier when modify a File', async () => { - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await BrowserActions.getUrl(browser.baseUrl + `/(overlay:files/${pngFileModel.id}/view)`); diff --git a/e2e/content-services/sso/sso-download-directive-component.e2e.ts b/e2e/content-services/sso/sso-download-directive-component.e2e.ts index 4e088c9535..46df8cec3e 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -60,7 +60,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList describe('SSO in ADF using ACS and AIS, implicit flow set', () => { beforeAll(async () => { - await apiService.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await apiService.login(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); acsUser = await usersActions.createUser(); diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index 02731f32c0..cd47a58245 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -120,7 +120,7 @@ describe('Login component', () => { it('[C260045] Should enable login button after entering a valid username and a password', async () => { await loginPage.goToLoginPage(); - await loginPage.enterUsername(browser.params.testConfig.admin.email); + await loginPage.enterUsername(browser.params.testConfig.users.admin.username); await expect(await loginPage.getSignInButtonIsEnabled()).toBe(false); await loginPage.enterPassword('a'); await expect(await loginPage.getSignInButtonIsEnabled()).toBe(true); @@ -157,7 +157,7 @@ describe('Login component', () => { await loginPage.goToLoginPage(); await expect(await loginPage.getSignInButtonIsEnabled()).toBe(false); - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await navigationBarPage.navigateToProcessServicesPage(); await processServicesPage.checkApsContainer(); await navigationBarPage.clickContentServicesButton(); @@ -169,7 +169,7 @@ describe('Login component', () => { await loginPage.goToLoginPage(); await expect(await loginPage.getSignInButtonIsEnabled()).toBe(false); - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await navigationBarPage.clickContentServicesButton(); await contentServicesPage.checkAcsContainer(); }); @@ -179,7 +179,7 @@ describe('Login component', () => { await loginPage.goToLoginPage(); await expect(await loginPage.getSignInButtonIsEnabled()).toBe(false); - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await navigationBarPage.navigateToProcessServicesPage(); await processServicesPage.checkApsContainer(); await navigationBarPage.clickContentServicesButton(); @@ -192,7 +192,7 @@ describe('Login component', () => { await LocalStorageUtil.setStorageItem('providers', 'ECM'); await loginPage.goToLoginPage(); - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await browser.executeScript('window.localStorage.removeItem("ADF_ticket-ECM");'); await BrowserActions.getUrl(browser.baseUrl + '/files'); await loginPage.waitForElements(); @@ -204,13 +204,13 @@ describe('Login component', () => { await loginPage.goToLoginPage(); await loginPage.enableSuccessRouteSwitch(); await loginPage.enterSuccessRoute('activiti'); - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await processServicesPage.checkApsContainer(); }); it('[C279931] Should the user be redirect to the login page when the Process Service session expire', async () => { await loginPage.goToLoginPage(); - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await browser.executeScript('window.localStorage.removeItem("ADF_ticket-BPM");'); await BrowserActions.getUrl(browser.baseUrl + '/activiti'); await loginPage.waitForElements(); @@ -218,7 +218,7 @@ describe('Login component', () => { it('[C279930] Should a user still be logged-in when open a new tab', async () => { await loginPage.goToLoginPage(); - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await browser.executeScript("window.open('about: blank', '_blank');"); diff --git a/e2e/core/login/login-sso/login-sso.e2e.ts b/e2e/core/login/login-sso/login-sso.e2e.ts index cc6120092b..264a2dc978 100644 --- a/e2e/core/login/login-sso/login-sso.e2e.ts +++ b/e2e/core/login/login-sso/login-sso.e2e.ts @@ -44,7 +44,7 @@ describe('Login component - SSO', () => { browser.params.testConfig.appConfig.oauth2.clientId, browser.params.testConfig.appConfig.oauth2.redirectUriLogout); - await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); }); it('[C280667] Should be redirect directly to keycloak without show the login page with silent login', async () => { @@ -57,7 +57,7 @@ describe('Login component - SSO', () => { browser.params.testConfig.appConfig.oauth2.clientId, browser.params.testConfig.appConfig.oauth2.redirectUriLogout); - await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); }); }); @@ -73,8 +73,8 @@ describe('Login component - SSO', () => { await loginPage.waitForElements(); - await loginPage.enterUsername(browser.params.testConfig.admin.email); - await loginPage.enterPassword(browser.params.testConfig.admin.password); + await loginPage.enterUsername(browser.params.testConfig.users.admin.username); + await loginPage.enterPassword(browser.params.testConfig.users.admin.password); await loginPage.clickSignInButton(); await BrowserVisibility.waitUntilElementIsVisible(loginPage.sidenavLayout); diff --git a/e2e/core/login/login-sso/logout-sso.e2e.ts b/e2e/core/login/login-sso/logout-sso.e2e.ts index 7b2ddfe060..b8c595e55c 100644 --- a/e2e/core/login/login-sso/logout-sso.e2e.ts +++ b/e2e/core/login/login-sso/logout-sso.e2e.ts @@ -27,7 +27,7 @@ describe('Logout component - SSO', () => { await settingsPage.setProviderEcmSso(browser.params.testConfig.appConfig.ecmHost, browser.params.testConfig.appConfig.oauth2.host, browser.params.testConfig.appConfig.identityHost, false, true, browser.params.testConfig.appConfig.oauth2.clientId, '/login'); - await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); await BrowserActions.clickExecuteScript('.app-sidenav-link[adf-logout]'); await browser.sleep(2000); diff --git a/e2e/core/pages/login-shell.page.ts b/e2e/core/pages/login-shell.page.ts index ed12d6b4aa..8860086648 100644 --- a/e2e/core/pages/login-shell.page.ts +++ b/e2e/core/pages/login-shell.page.ts @@ -210,4 +210,8 @@ export class LoginShellPage { async login(username: string, password: string): Promise { await this.loginSSOPage.login(username, password); } + + async loginWithProfile(profile: string): Promise { + await this.loginSSOPage.loginWithProfile(profile); + } } diff --git a/e2e/core/settings-component.e2e.ts b/e2e/core/settings-component.e2e.ts index 9f1c9b8b13..10695ee671 100644 --- a/e2e/core/settings-component.e2e.ts +++ b/e2e/core/settings-component.e2e.ts @@ -79,8 +79,8 @@ describe('Settings component', () => { await settingsPage.setContentServicesURL('http://localhost:7070'); await settingsPage.clickApply(); await loginPage.waitForElements(); - await loginPage.enterUsername(browser.params.testConfig.admin.email); - await loginPage.enterPassword(browser.params.testConfig.admin.password); + await loginPage.enterUsername(browser.params.testConfig.users.admin.username); + await loginPage.enterPassword(browser.params.testConfig.users.admin.password); await loginPage.clickSignInButton(); await loginPage.checkLoginErrorIsDisplayed(loginError); }); @@ -90,8 +90,8 @@ describe('Settings component', () => { await settingsPage.setProcessServicesURL('http://localhost:7070'); await settingsPage.clickApply(); await loginPage.waitForElements(); - await loginPage.enterUsername(browser.params.testConfig.admin.email); - await loginPage.enterPassword(browser.params.testConfig.admin.password); + await loginPage.enterUsername(browser.params.testConfig.users.admin.username); + await loginPage.enterPassword(browser.params.testConfig.users.admin.password); await loginPage.clickSignInButton(); await loginPage.checkLoginErrorIsDisplayed(loginError); }); @@ -135,8 +135,8 @@ describe('Settings component', () => { await settingsPage.checkProviderDropdownIsDisplayed(); await settingsPage.setProviderBpm(); await loginPage.waitForElements(); - await loginPage.enterUsername(browser.params.testConfig.admin.email); - await loginPage.enterPassword(browser.params.testConfig.admin.password); + await loginPage.enterUsername(browser.params.testConfig.users.admin.username); + await loginPage.enterPassword(browser.params.testConfig.users.admin.password); await loginPage.clickSignInButton(); await navigationBarPage.navigateToProcessServicesPage(); await processServicesPage.checkApsContainer(); @@ -165,8 +165,8 @@ describe('Settings component', () => { await settingsPage.checkProviderDropdownIsDisplayed(); await settingsPage.setProviderEcm(); await loginPage.waitForElements(); - await loginPage.enterUsername(browser.params.testConfig.admin.email); - await loginPage.enterPassword(browser.params.testConfig.admin.password); + await loginPage.enterUsername(browser.params.testConfig.users.admin.username); + await loginPage.enterPassword(browser.params.testConfig.users.admin.password); await loginPage.clickSignInButton(); await navigationBarPage.clickContentServicesButton(); await contentServicesPage.checkAcsContainer(); @@ -192,8 +192,8 @@ describe('Settings component', () => { await settingsPage.checkProviderDropdownIsDisplayed(); await settingsPage.setProviderEcmBpm(); await loginPage.waitForElements(); - await loginPage.enterUsername(browser.params.testConfig.admin.email); - await loginPage.enterPassword(browser.params.testConfig.admin.password); + await loginPage.enterUsername(browser.params.testConfig.users.admin.username); + await loginPage.enterPassword(browser.params.testConfig.users.admin.password); await loginPage.clickSignInButton(); await navigationBarPage.clickContentServicesButton(); await contentServicesPage.checkAcsContainer(); diff --git a/e2e/core/user-info-component-cloud.e2e.ts b/e2e/core/user-info-component-cloud.e2e.ts index 3d043ea3ad..d0c329f8fa 100644 --- a/e2e/core/user-info-component-cloud.e2e.ts +++ b/e2e/core/user-info-component-cloud.e2e.ts @@ -30,7 +30,7 @@ describe('User Info - SSO', () => { let identityUser; beforeAll(async () => { - await apiService.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await apiService.login(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); identityUser = await usersActions.createUser(); diff --git a/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts b/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts index 5efff24422..b072d34662 100644 --- a/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts +++ b/e2e/process-services-cloud/about-process-services-cloud.component.e2e.ts @@ -16,7 +16,6 @@ */ import { ApiService, IdentityService, AboutPage, LoginPage } from '@alfresco/adf-testing'; -import { browser } from 'protractor'; import { NavigationBarPage } from '../core/pages/navigation-bar.page'; describe('About Process Services Cloud', () => { @@ -31,7 +30,7 @@ describe('About Process Services Cloud', () => { let testUser; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER, identityService.ROLES.ACTIVITI_DEVOPS]); await loginSSOPage.login(testUser.email, testUser.password); await apiService.login(testUser.email, testUser.password); @@ -39,7 +38,7 @@ describe('About Process Services Cloud', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/apps-section-cloud.e2e.ts b/e2e/process-services-cloud/apps-section-cloud.e2e.ts index 7319167ac9..77ddd9b861 100644 --- a/e2e/process-services-cloud/apps-section-cloud.e2e.ts +++ b/e2e/process-services-cloud/apps-section-cloud.e2e.ts @@ -36,7 +36,7 @@ describe('Applications list', () => { let applications; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER, identityService.ROLES.ACTIVITI_DEVOPS]); await loginSSOPage.login(testUser.email, testUser.password); @@ -53,7 +53,7 @@ describe('Applications list', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 08c77bcd8c..84d66f6aba 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts @@ -47,7 +47,7 @@ describe('Edit process filters cloud', () => { const PROCESSES = CONSTANTS.PROCESS_FILTERS; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -57,7 +57,7 @@ describe('Edit process filters cloud', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 ec674b802b..bfa6cc2d27 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', () => { assignedTaskName = StringUtil.generateRandomString(); beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -63,7 +63,7 @@ describe('Edit task filters cloud', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 0369b1cd15..f58997ca14 100644 --- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts +++ b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts @@ -50,7 +50,7 @@ describe('Form Field Component - Dropdown Widget', () => { const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); @@ -73,7 +73,7 @@ describe('Form Field Component - Dropdown Widget', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts b/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts index 5c36a1e30c..4ace20ce88 100644 --- a/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts +++ b/e2e/process-services-cloud/form-field/people-group-of-people.e2e.ts @@ -21,7 +21,6 @@ import { LoginPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing'; -import { browser } from 'protractor'; import { peopleSingleModeFormMock, peopleMultipleModeFormMock, @@ -71,7 +70,7 @@ describe('People and Group of people Widgets', () => { }; beforeAll(async () => { - await loginSSOPage.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await loginSSOPage.loginWithProfile('hrUser'); await navigationBarPage.navigateToFormCloudPage(); }); diff --git a/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts b/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts index abf93a9d30..204df414ad 100644 --- a/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts +++ b/e2e/process-services-cloud/form-field/task-visibility-condition.e2e.ts @@ -56,7 +56,7 @@ describe('Task cloud visibility', async () => { let testUser, groupInfo; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -66,7 +66,7 @@ describe('Task cloud visibility', async () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 ecdf70ad13..ff83eb6e34 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 @@ -16,7 +16,6 @@ */ import { FormCloudComponentPage, LoginPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing'; -import { browser } from 'protractor'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { tabFieldValueVisibilityJson, tabVarValueVisibilityJson, tabVarFieldVisibilityJson, @@ -52,7 +51,7 @@ describe('Visibility conditions on tabs - cloud', () => { }; beforeAll(async () => { - await loginSSOPage.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await loginSSOPage.loginWithProfile('hrUser'); 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 2a2ecafc38..0cd222506a 100644 --- a/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts +++ b/e2e/process-services-cloud/form-field/visibility-condition.e2e.ts @@ -16,7 +16,6 @@ */ import { FormCloudComponentPage, LoginPage, ProcessCloudWidgetPage } from '@alfresco/adf-testing'; -import { browser } from 'protractor'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { checkboxVisibilityFormJson, multipleCheckboxVisibilityFormJson } from '../../resources/forms/checkbox-visibility-condition'; @@ -81,7 +80,7 @@ describe('Visibility conditions - cloud', () => { }; beforeAll(async () => { - await loginSSOPage.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await loginSSOPage.loginWithProfile('hrUser'); await navigationBarPage.navigateToFormCloudPage(); await formCloudDemoPage.setConfigToEditor(checkboxVisibilityFormJson); }); 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 e03444d70d..a61a6563c2 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts @@ -57,7 +57,7 @@ describe('People Groups Cloud Component', () => { let groups = []; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); apsUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); @@ -84,7 +84,7 @@ describe('People Groups Cloud Component', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); for (const user of users) { await identityService.deleteIdentityUser(user); } 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 f6fb4e93ce..c2da8d49fd 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 @@ -42,7 +42,7 @@ describe('People Groups Cloud Component', () => { let testGroup; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); hrGroup = await groupIdentityService.getGroupInfoByGroupName('hr'); testGroup = await groupIdentityService.getGroupInfoByGroupName('testgroup'); @@ -61,7 +61,7 @@ describe('People Groups Cloud Component', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); for (let i = 0; i < users.length; i++) { await identityService.deleteIdentityUser(users[i]); } diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index ed4a7b845c..2fd84aee2f 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -51,7 +51,7 @@ describe('Process list cloud', () => { const candidateBaseApp = browser.params.resources.ACTIVITI_CLOUD_APPS.CANDIDATE_BASE_APP.name; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); @@ -99,7 +99,7 @@ describe('Process list cloud', () => { afterAll(async () => { await apiService.login(testUser.email, testUser.password); await processInstancesService.deleteProcessInstance(anotherProcessInstance.entry.id, candidateBaseApp); - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/process-filter-results.e2e.ts b/e2e/process-services-cloud/process-filter-results.e2e.ts index 7cdbcaab82..c8d1c2c240 100644 --- a/e2e/process-services-cloud/process-filter-results.e2e.ts +++ b/e2e/process-services-cloud/process-filter-results.e2e.ts @@ -70,7 +70,7 @@ describe('Process filters cloud', () => { const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); anotherUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); @@ -133,7 +133,7 @@ describe('Process filters cloud', () => { await apiService.login(anotherUser.email, anotherUser.password); await processInstancesService.deleteProcessInstance(differentAppUserProcessInstance.entry.id, simpleApp); - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); await identityService.deleteIdentityUser(anotherUser.idIdentityService); diff --git a/e2e/process-services-cloud/process-filter-task.e2e.ts b/e2e/process-services-cloud/process-filter-task.e2e.ts index a8701bdfce..56b14c8cb4 100644 --- a/e2e/process-services-cloud/process-filter-task.e2e.ts +++ b/e2e/process-services-cloud/process-filter-task.e2e.ts @@ -65,7 +65,7 @@ describe('Process filters cloud', () => { const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; beforeAll(async () => { - await apiService.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await apiService.loginWithProfile('hrUser'); simpleProcessDefinition = (await processDefinitionService .getProcessDefinitionByName(browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.processes.processstring, simpleApp)).entry; @@ -73,7 +73,7 @@ describe('Process filters cloud', () => { taskAssigned = (await queryService.getProcessInstanceTasks(processInstance.id, simpleApp)).list.entries; taskName = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.tasks.processstring; - await loginSSOPage.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await loginSSOPage.loginWithProfile('hrUser'); 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 235aa22516..b739d99daf 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-filters-cloud.e2e.ts @@ -57,7 +57,7 @@ describe('Process filters cloud', () => { const PROCESSES = CONSTANTS.PROCESS_FILTERS; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); @@ -87,7 +87,7 @@ describe('Process filters cloud', () => { }, 5 * 60 * 1000); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 3a27b14106..36033c48bc 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-header-cloud.e2e.ts @@ -54,7 +54,7 @@ describe('Process Header cloud component', () => { const PROCESSES = CONSTANTS.PROCESS_FILTERS; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -86,7 +86,7 @@ describe('Process Header cloud component', () => { }); afterAll(async() => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 7ab3ecc83b..f664ed5dd8 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 @@ -52,7 +52,7 @@ describe('Process list cloud', () => { let testUser, groupInfo, editProcess, deleteProcess; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -95,7 +95,7 @@ describe('Process list cloud', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 d3ec66eceb..2bfba57548 100644 --- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts @@ -52,7 +52,7 @@ describe('Process list cloud', () => { const PROCESSES = CONSTANTS.PROCESS_FILTERS; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -72,7 +72,7 @@ describe('Process list cloud', () => { }); afterAll(async() => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts index 543335d01c..372461c125 100644 --- a/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts +++ b/e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts @@ -81,7 +81,7 @@ describe('Process Task - Attach content file', () => { }; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -105,7 +105,7 @@ describe('Process Task - Attach content file', () => { afterAll(async () => { await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id); - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/start-process-cloud.e2e.ts b/e2e/process-services-cloud/start-process-cloud.e2e.ts index 7d9825a632..a4b96d8c2f 100644 --- a/e2e/process-services-cloud/start-process-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-process-cloud.e2e.ts @@ -42,7 +42,7 @@ describe('Start Process', () => { let testUser, groupInfo; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -55,7 +55,7 @@ describe('Start Process', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts index d1a1ae9245..9819eebe8a 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts @@ -95,7 +95,7 @@ describe('Start Task Form', () => { let uploadedFolder; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -156,7 +156,7 @@ describe('Start Task Form', () => { const standaloneTaskId = await tasksService.getTaskId(standaloneTaskName, candidateBaseApp); await tasksService.deleteTask(standaloneTaskId, candidateBaseApp); - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 f39dea7978..0e3a4a5338 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 @@ -58,7 +58,7 @@ describe('Start Task', () => { let apsUser, testUser, activitiUser, groupInfo; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); apsUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER, identityService.ROLES.ACTIVITI_USER]); @@ -84,7 +84,7 @@ describe('Start Task', () => { taskId = await tasksService.getTaskId(reassignTaskName, simpleApp); await tasksService.deleteTask(taskId, simpleApp); - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(activitiUser.idIdentityService); await identityService.deleteIdentityUser(apsUser.idIdentityService); await identityService.deleteIdentityUser(testUser.idIdentityService); 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 4493535517..c8ebec286f 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 @@ -52,7 +52,7 @@ describe('Start Task - Group Cloud Component', () => { let apsUser, testUser, hrGroup, testGroup; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUser(); hrGroup = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -76,7 +76,7 @@ describe('Start Task - Group Cloud Component', () => { const oneGroupTaskId = await tasksService.getTaskId(oneGroupTaskName, simpleApp); await tasksService.deleteTask(oneGroupTaskId, simpleApp); - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(apsUser.idIdentityService); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/task-filters-cloud.e2e.ts b/e2e/process-services-cloud/task-filters-cloud.e2e.ts index cfdcc4f6e7..e4457f11f3 100644 --- a/e2e/process-services-cloud/task-filters-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-filters-cloud.e2e.ts @@ -51,7 +51,7 @@ describe('Task filters cloud', () => { const newTask = StringUtil.generateRandomString(5), completedTask = StringUtil.generateRandomString(5); beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -63,7 +63,7 @@ describe('Task filters cloud', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts b/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts index f0971a6687..b962b76b76 100644 --- a/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component-tab.e2e.ts @@ -84,7 +84,7 @@ describe('Task form cloud component', () => { const completedTasksFilter = 'completed-tasks'; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); identityService = new IdentityService(apiService); const groupIdentityService = new GroupIdentityService(apiService); @@ -151,7 +151,7 @@ describe('Task form cloud component', () => { afterAll(async () => { try { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); } catch (error) { } 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 4919b255fe..8d60aeb9b8 100644 --- a/e2e/process-services-cloud/task-form-cloud-component.e2e.ts +++ b/e2e/process-services-cloud/task-form-cloud-component.e2e.ts @@ -67,7 +67,7 @@ describe('Task form cloud component', () => { let dateTimerTaskId, dateTimerTask, dateTimerChangedTaskId, dateTimerChangedTask, dropdownOptionsTask; beforeAll(async () => { - await apiService.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await apiService.loginWithProfile('hrUser'); createdTask = await tasksService.createStandaloneTask(StringUtil.generateRandomString(), candidateBaseApp); @@ -126,7 +126,7 @@ describe('Task form cloud component', () => { assigneeReleaseTask = await queryService.getProcessInstanceTasks(assigneeProcess.entry.id, simpleApp); assigneeTaskId = assigneeReleaseTask.list.entries[0].entry.id; - await loginSSOPage.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await loginSSOPage.loginWithProfile('hrUser'); }, 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 4ea784677b..2ef1ba21ff 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -99,7 +99,7 @@ describe('Task Header cloud component', () => { }; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -125,7 +125,7 @@ describe('Task Header cloud component', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); 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 55e2c1ac26..f3582e73dd 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 @@ -42,7 +42,7 @@ describe('Process list cloud', () => { let testUser, groupInfo, editProcess, deleteProcess, editTask, deleteTask; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); @@ -64,7 +64,7 @@ describe('Process list cloud', () => { }); afterAll(async() => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/task-list-properties-sort.e2e.ts b/e2e/process-services-cloud/task-list-properties-sort.e2e.ts index 320ca0e5a1..03b7462b66 100644 --- a/e2e/process-services-cloud/task-list-properties-sort.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties-sort.e2e.ts @@ -44,7 +44,7 @@ describe('Edit task filters and task list properties', () => { const priority = 30; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); @@ -111,7 +111,7 @@ describe('Edit task filters and task list properties', () => { }, 5 * 60 * 1000); afterAll(async (done) => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); done(); }); diff --git a/e2e/process-services-cloud/task-list-properties.e2e.ts b/e2e/process-services-cloud/task-list-properties.e2e.ts index 3e11e394bd..c44dffac0d 100644 --- a/e2e/process-services-cloud/task-list-properties.e2e.ts +++ b/e2e/process-services-cloud/task-list-properties.e2e.ts @@ -55,7 +55,7 @@ describe('Edit task filters and task list properties', () => { const afterDate = moment().add(1, 'days').format('DD/MM/YYYY'); beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); @@ -94,7 +94,7 @@ describe('Edit task filters and task list properties', () => { }, 5 * 60 * 1000); afterAll(async (done) => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); done(); }); diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index 15fce99ce6..434a322582 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/e2e/process-services-cloud/task-list-selection.e2e.ts @@ -49,7 +49,7 @@ describe('Task list cloud - selection', () => { const tasks = []; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); @@ -67,7 +67,7 @@ describe('Task list cloud - selection', () => { }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }); diff --git a/e2e/process-services-cloud/tasks-claim-release.e2e.ts b/e2e/process-services-cloud/tasks-claim-release.e2e.ts index de1ec033ac..106fe38c06 100644 --- a/e2e/process-services-cloud/tasks-claim-release.e2e.ts +++ b/e2e/process-services-cloud/tasks-claim-release.e2e.ts @@ -52,13 +52,13 @@ describe('Task claim/release', () => { describe('candidate user', () => { beforeAll(async () => { - await apiService.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await apiService.login(browser.params.testConfig.users.hrUser.username, browser.params.testConfig.users.hrUser.password); const processDefinition = await processDefinitionService.getProcessDefinitionByName(candidateApp.processes.candidateUserProcess, candidateApp.name); processInstance = (await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateApp.name)).entry; }); beforeEach(async () => { - await navigateToApp(browser.params.testConfig.hrUser); + await navigateToApp(browser.params.testConfig.users.hrUser); }); afterAll(async () => { @@ -84,7 +84,7 @@ describe('Task claim/release', () => { await taskFormCloudComponent.checkReleaseButtonIsDisplayed(); await expect(await taskHeaderCloudPage.getStatus()).toEqual('ASSIGNED'); - await expect(await taskHeaderCloudPage.getAssignee()).toEqual(browser.params.testConfig.hrUser.email); + await expect(await taskHeaderCloudPage.getAssignee()).toEqual(browser.params.testConfig.users.hrUser.username); await taskFormCloudComponent.clickReleaseButton(); await browser.refresh(); @@ -103,29 +103,29 @@ describe('Task claim/release', () => { let candidate; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); identityService = new IdentityService(apiService); groupIdentityService = new GroupIdentityService(apiService); candidate = await identityService.createIdentityUserWithRole([identityService.ROLES.ACTIVITI_USER]); const groupInfo = await groupIdentityService.getGroupInfoByGroupName('hr'); await identityService.addUserToGroup(candidate.idIdentityService, groupInfo.id); - await apiService.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await apiService.login(browser.params.testConfig.users.hrUser.username, browser.params.testConfig.users.hrUser.password); const processDefinition = await processDefinitionService.getProcessDefinitionByName(candidateApp.processes.uploadFileProcess, candidateApp.name); processInstance = (await processInstancesService.createProcessInstance(processDefinition.entry.key, candidateApp.name)).entry; }); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(candidate.idIdentityService); - await apiService.login(browser.params.testConfig.hrUser.email, browser.params.testConfig.hrUser.password); + await apiService.login(browser.params.testConfig.users.hrUser.username, browser.params.testConfig.users.hrUser.password); await processInstancesService.deleteProcessInstance(processInstance.id, processInstance.appName); await navigationBarPage.clickLogoutButton(); }); it('[C306875] should be able to Claim/Release a process task which has a candidate group', async () => { - await navigateToApp(browser.params.testConfig.hrUser); + await navigateToApp(browser.params.testConfig.users.hrUser); await setTaskFilter('CREATED', processInstance.id); await tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(candidateApp.tasks.uploadFileTask); @@ -142,7 +142,7 @@ describe('Task claim/release', () => { await taskFormCloudComponent.checkReleaseButtonIsDisplayed(); await expect(await taskHeaderCloudPage.getStatus()).toEqual('ASSIGNED'); - await expect(await taskHeaderCloudPage.getAssignee()).toEqual(browser.params.testConfig.hrUser.email); + await expect(await taskHeaderCloudPage.getAssignee()).toEqual(browser.params.testConfig.users.hrUser.username); await taskFormCloudComponent.clickReleaseButton(); await browser.refresh(); @@ -184,7 +184,7 @@ describe('Task claim/release', () => { }); async function navigateToApp(user) { - await loginSSOPage.login(user.email, user.password); + await loginSSOPage.login(user.username, user.password); await LocalStorageUtil.setConfigField('adf-edit-task-filter', JSON.stringify(taskFilterConfiguration)); await navigationBarPage.navigateToProcessServicesCloudPage(); diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index 7bcc2473d9..3cb8fa51e9 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts @@ -60,7 +60,7 @@ describe('Task filters cloud', () => { const nrOfTasks = 3; beforeAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); testUser = await identityService.createIdentityUserWithRole( [identityService.ROLES.ACTIVITI_USER]); @@ -96,7 +96,7 @@ describe('Task filters cloud', () => { }, 5 * 60 * 1000); afterAll(async () => { - await apiService.login(browser.params.identityAdmin.email, browser.params.identityAdmin.password); + await apiService.loginWithProfile('identityAdmin'); await identityService.deleteIdentityUser(testUser.idIdentityService); }, 60000); diff --git a/e2e/process-services/attach-file-content-service.e2e.ts b/e2e/process-services/attach-file-content-service.e2e.ts index e7b27f8316..796896c279 100644 --- a/e2e/process-services/attach-file-content-service.e2e.ts +++ b/e2e/process-services/attach-file-content-service.e2e.ts @@ -59,8 +59,6 @@ describe('Attach File - Content service', () => { const uploadActions = new UploadActions(apiService); const usersActions = new UsersActions(apiService); - const { email, password } = browser.params.testConfig.admin; - const pdfFileOne = { name: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_name, location: browser.params.resources.Files.ADF_DOCUMENTS.PDF.file_path @@ -78,10 +76,10 @@ describe('Attach File - Content service', () => { beforeAll(async () => { await LocalStorageUtil.setStorageItem('providers', 'ALL'); - await apiService.login(email, password); + await apiService.loginWithProfile('admin'); user = await usersActions.createUser(); - await apiServiceExternal.login(email, password); + await apiServiceExternal.loginWithProfile('admin'); await usersActionsExternal.createUser(user); await integrationService.addCSIntegration({ @@ -104,7 +102,7 @@ describe('Attach File - Content service', () => { }); afterAll(async () => { - await apiService.login(email, password); + await apiService.loginWithProfile('admin'); await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId); }); diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index 6f63e68aaa..e680fafc90 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/e2e/process-services/start-process-component.e2e.ts @@ -487,7 +487,7 @@ describe('Start Process Component', () => { const usersActions = new UsersActions(apiServiceAll); - await apiServiceAll.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await apiServiceAll.login(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); processUserModel = await usersActions.createUser(); diff --git a/e2e/protractor/save-remote.js b/e2e/protractor/save-remote.js index 2ef0a8a6b6..f6705f3ed3 100644 --- a/e2e/protractor/save-remote.js +++ b/e2e/protractor/save-remote.js @@ -21,7 +21,7 @@ async function uploadScreenshot(retryCount, suffixFileName) { hostEcm: TestConfig.screenshot.url }); - await alfrescoJsApi.login(TestConfig.screenshot.username, TestConfig.screenshot.password); + await alfrescoJsApi.login(TestConfig.users.screenshot.username, TestConfig.users.screenshot.password); let folderNode; diff --git a/e2e/search/components/search-check-list.e2e.ts b/e2e/search/components/search-check-list.e2e.ts index cf8b298bad..1d359503de 100644 --- a/e2e/search/components/search-check-list.e2e.ts +++ b/e2e/search/components/search-check-list.e2e.ts @@ -89,7 +89,7 @@ describe('Search Checklist Component', () => { }); afterAll(async () => { - await apiService.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await apiService.login(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); await uploadActions.deleteFileOrFolder(createdFile.entry.id); await uploadActions.deleteFileOrFolder(createdFolder.entry.id); diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index 1138e907fd..a6e957d5d6 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/e2e/search/components/search-date-range.e2e.ts @@ -35,7 +35,7 @@ describe('Search Date Range Filter', () => { const dataTable = new DataTableComponentPage(); beforeAll(async () => { - await loginPage.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await loginPage.loginWithProfile('admin'); await searchBarPage.checkSearchIconIsVisible(); await searchBarPage.clickOnSearchIcon(); diff --git a/e2e/search/search-page.e2e.ts b/e2e/search/search-page.e2e.ts index 28dc20dc51..94093d5df6 100644 --- a/e2e/search/search-page.e2e.ts +++ b/e2e/search/search-page.e2e.ts @@ -82,7 +82,7 @@ describe('Search component - Search Page', () => { await uploadActions.uploadFile(firstFileModel.location, firstFileModel.name, '-my-'); - await apiService.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await apiService.login(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); await uploadActions.createEmptyFiles(adminFileNames, newFolderModelUploaded.entry.id); diff --git a/e2e/test.config.js b/e2e/test.config.js index eead1a7822..4082a782ad 100644 --- a/e2e/test.config.js +++ b/e2e/test.config.js @@ -79,25 +79,31 @@ module.exports = { rootPath: __dirname }, - admin: { - email: USERNAME_ADF, - password: PASSWORD_ADF - }, + users: { - identityAdmin: { - email: IDENTITY_ADMIN_EMAIL, - password: IDENTITY_ADMIN_PASSWORD - }, + admin: { + username: USERNAME_ADF, + password: PASSWORD_ADF + }, - hrUser: { - email: HR_USER, - password: HR_USER_PASSWORD + identityAdmin: { + username: IDENTITY_ADMIN_EMAIL, + password: IDENTITY_ADMIN_PASSWORD + }, + + hrUser: { + username: HR_USER, + password: HR_USER_PASSWORD + }, + + screenshot: { + username: USERNAME_ADF, + password: PASSWORD_ADF + }, }, screenshot: { url: HOST_ECM, - username: USERNAME_ADF, - password: PASSWORD_ADF }, adf_external_acs: { diff --git a/lib/testing/src/lib/core/actions/api.service.ts b/lib/testing/src/lib/core/actions/api.service.ts index fd18dea0a7..c753fb5975 100644 --- a/lib/testing/src/lib/core/actions/api.service.ts +++ b/lib/testing/src/lib/core/actions/api.service.ts @@ -91,9 +91,9 @@ export class ApiService { * Example: loginWithProfile('admin') */ async loginWithProfile(profileName: string): Promise { - const profile = browser.params.testConfig[profileName]; + const profile = browser.params.testConfig.users[profileName]; if (profile) { - await this.apiService.login(profile.email, profile.password); + await this.apiService.login(profile.username, profile.password); } else { throw new Error(`Login profile "${profileName}" not found on "browser.params.testConfig".`); } diff --git a/lib/testing/src/lib/core/actions/users.actions.ts b/lib/testing/src/lib/core/actions/users.actions.ts index 75fe103f3c..3f0903dd2d 100644 --- a/lib/testing/src/lib/core/actions/users.actions.ts +++ b/lib/testing/src/lib/core/actions/users.actions.ts @@ -40,7 +40,7 @@ export class UsersActions { async createUser(userModel?: UserModel): Promise { if (!this.api.apiService.isLoggedIn()) { - await this.api.apiService.login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password); + await this.api.apiService.login(browser.params.testConfig.users.admin.username, browser.params.testConfig.users.admin.password); } const user = new UserModel({ ...(userModel ? userModel : {}) }); diff --git a/lib/testing/src/lib/core/pages/login.page.ts b/lib/testing/src/lib/core/pages/login.page.ts index 36a0ac9b6e..09c1044229 100644 --- a/lib/testing/src/lib/core/pages/login.page.ts +++ b/lib/testing/src/lib/core/pages/login.page.ts @@ -53,6 +53,15 @@ export class LoginPage { await BrowserVisibility.waitUntilElementIsVisible(this.txtPasswordBasicAuth); } + async loginWithProfile(profileName: string): Promise { + const profile = browser.params.testConfig.users[profileName]; + if (profile) { + await this.login(profile.username, profile.password); + } else { + throw new Error(`Login profile "${profileName}" not found on "browser.params.testConfig".`); + } + } + async login(username: string, password: string) { Logger.log('Login With ' + username);