Unify hash url strategy (#5866)

* unify hash url startegy

* improve
This commit is contained in:
Eugenio Romano
2020-07-14 16:00:32 +01:00
committed by GitHub
parent 8ac683d164
commit d1672596ba
182 changed files with 476 additions and 520 deletions

View File

@@ -21,7 +21,9 @@ import { BrowserActions } from '../utils/browser-actions';
import { LocalStorageUtil } from '../utils/local-storage.util';
import { Logger } from '../utils/logger';
export class LoginSSOPage {
export class LoginPage {
loginUrl = `${browser.baseUrl}/login`;
ssoButton = element(by.css(`[data-automation-id="login-button-sso"]`));
usernameField = element(by.id('username'));
@@ -43,8 +45,8 @@ export class LoginSSOPage {
} catch (e) {
}
if (!currentUrl || currentUrl.indexOf(`${browser.baseUrl}/login`) === -1) {
await BrowserActions.getUrl(browser.baseUrl + '/login');
if (!currentUrl || currentUrl.indexOf(this.loginUrl) === -1) {
await BrowserActions.getUrl(this.loginUrl);
}
await BrowserVisibility.waitUntilElementIsVisible(this.txtUsernameBasicAuth);

View File

@@ -19,7 +19,10 @@ export * from './bread-crumb.page';
export * from './header.page';
export * from './user-info.page';
export * from './settings.page';
export * from './login-sso.page';
export * from './login.page';
export { LoginPage as LoginSSOPage } from './login.page';
export * from './data-table-component.page';
export * from './pagination.page';
export * from './error.page';

View File

@@ -40,10 +40,6 @@ export interface TestConfiguration {
rootPath: string;
};
adf: {
url: string;
};
adf_external_acs: {
host: string;
};