mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
AAE-22865 - Fixing webdriver version used and installed (#9749)
* Fixing webdriver version used and installed * Fixing webdriver selenium version * Disabling Code flow for grant password auth * Removing the install from the script as it's done in the postinstall now * It's funny how this tests work * Having codeflow disabled by default * Checking if Core tests pass * Refreshing as SSO button is broken after clicking apply
This commit is contained in:
@@ -33,6 +33,7 @@ export class SettingsPage {
|
||||
silentLoginToggleElement = $(`${materialLocators.Slide.toggle.root}[formcontrolname="silentLogin"]`);
|
||||
implicitFlowLabel = $(`${materialLocators.Slide.toggle.root}[formcontrolname="implicitFlow"] label`);
|
||||
implicitFlowElement = $(`${materialLocators.Slide.toggle.root}[formcontrolname="implicitFlow"]`);
|
||||
codeFlowElement = $(`${materialLocators.Slide.toggle.root}[formcontrolname="codeFlow"]`);
|
||||
applyButton = $('button[data-automation-id="settings-apply-button"]');
|
||||
providerDropdown = new DropdownPage($(`${materialLocators.Select.root}[id="adf-provider-selector"]`));
|
||||
|
||||
@@ -41,8 +42,7 @@ export class SettingsPage {
|
||||
|
||||
try {
|
||||
currentUrl = await browser.getCurrentUrl();
|
||||
} catch (e) {
|
||||
}
|
||||
} catch (e) {}
|
||||
|
||||
if (!currentUrl || currentUrl.indexOf(this.settingsURL) === -1) {
|
||||
await browser.get(this.settingsURL);
|
||||
@@ -59,7 +59,15 @@ export class SettingsPage {
|
||||
await BrowserActions.click(this.ssoRadioButton);
|
||||
}
|
||||
|
||||
async setProviderEcmSso(contentServiceURL, authHost, identityHost, silentLogin = true, implicitFlow = true, clientId?: string, logoutUrl: string = '/logout') {
|
||||
async setProviderEcmSso(
|
||||
contentServiceURL,
|
||||
authHost,
|
||||
identityHost,
|
||||
silentLogin = true,
|
||||
implicitFlow = true,
|
||||
clientId?: string,
|
||||
logoutUrl: string = '/logout'
|
||||
) {
|
||||
await this.goToSettingsPage();
|
||||
await this.setProvider('ECM');
|
||||
await this.clickSsoRadioButton();
|
||||
@@ -74,6 +82,30 @@ export class SettingsPage {
|
||||
await browser.sleep(1000);
|
||||
}
|
||||
|
||||
async setProviderEcmSsoWithoutCodeFlow(
|
||||
contentServiceURL,
|
||||
authHost,
|
||||
identityHost,
|
||||
silentLogin = true,
|
||||
implicitFlow = true,
|
||||
clientId?: string,
|
||||
logoutUrl: string = '/logout'
|
||||
) {
|
||||
await this.goToSettingsPage();
|
||||
await this.setProvider('ECM');
|
||||
await this.clickSsoRadioButton();
|
||||
await this.setContentServicesURL(contentServiceURL);
|
||||
await this.setAuthHost(authHost);
|
||||
await this.setIdentityHost(identityHost);
|
||||
await this.setSilentLogin(silentLogin);
|
||||
await this.setCodeFlow(false);
|
||||
await this.setImplicitFlow(implicitFlow);
|
||||
await this.setClientId(clientId);
|
||||
await this.setLogoutUrl(logoutUrl);
|
||||
await this.clickApply();
|
||||
await browser.sleep(1000);
|
||||
}
|
||||
|
||||
async setLogoutUrl(logoutUrl) {
|
||||
await BrowserVisibility.waitUntilElementIsPresent(this.logoutUrlText);
|
||||
await BrowserActions.clearSendKeys(this.logoutUrlText, logoutUrl);
|
||||
@@ -104,7 +136,7 @@ export class SettingsPage {
|
||||
|
||||
const isChecked = (await BrowserActions.getAttribute(this.silentLoginToggleElement, 'class')).includes(materialLocators.Checked.root);
|
||||
|
||||
if (isChecked && !enableToggle || !isChecked && enableToggle) {
|
||||
if ((isChecked && !enableToggle) || (!isChecked && enableToggle)) {
|
||||
await BrowserActions.click(this.silentLoginToggleLabel);
|
||||
}
|
||||
}
|
||||
@@ -114,8 +146,18 @@ export class SettingsPage {
|
||||
|
||||
const isChecked = (await BrowserActions.getAttribute(this.implicitFlowElement, 'class')).includes(materialLocators.Checked.root);
|
||||
|
||||
if (isChecked && !enableToggle || !isChecked && enableToggle) {
|
||||
if ((isChecked && !enableToggle) || (!isChecked && enableToggle)) {
|
||||
await BrowserActions.click(this.implicitFlowLabel);
|
||||
}
|
||||
}
|
||||
|
||||
async setCodeFlow(enableToggle) {
|
||||
await BrowserVisibility.waitUntilElementIsVisible(this.codeFlowElement);
|
||||
|
||||
const isChecked = (await BrowserActions.getAttribute(this.codeFlowElement, 'class')).includes(materialLocators.Checked.root);
|
||||
|
||||
if ((isChecked && !enableToggle) || (!isChecked && enableToggle)) {
|
||||
await BrowserActions.click(this.codeFlowElement);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user