inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

move users in the users object to make loginWithProgile general purpose (#6270)

Browse Source 
* 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
This commit is contained in:
Eugenio Romano
2020-10-26 17:46:54 +00:00
committed by GitHub
parent c6a3da2a74
commit fca378a12b
51 changed files with 140 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e2e/core/login/login-component.e2e.ts
View File

@@ -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');");

8
e2e/core/login/login-sso/login-sso.e2e.ts
View File

@@ -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);

2
e2e/core/login/login-sso/logout-sso.e2e.ts
View File

@@ -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);

4
e2e/core/pages/login-shell.page.ts
View File

@@ -210,4 +210,8 @@ export class LoginShellPage {
async login(username: string, password: string): Promise<void> {
await this.loginSSOPage.login(username, password);
}
async loginWithProfile(profile: string): Promise<void> {
await this.loginSSOPage.loginWithProfile(profile);
}
}

20
e2e/core/settings-component.e2e.ts
View File

@@ -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();

2
e2e/core/user-info-component-cloud.e2e.ts
View File

@@ -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();