libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Modify xpath for account console logout in the webauthn tests

Browse source 
Closes #30024

Signed-off-by: rmartinc <rmartinc@redhat.com>
This commit is contained in:
rmartinc 2024-05-31 12:04:02 +02:00 committed by Alexander Schwartz
parent 0f6f9543ba
commit 068ce5a61f
5 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/apps/account-ui/src/root/Header.tsx
View file

@ -45,6 +45,7 @@ export const Header = () => {
return (
<KeycloakMasthead
data-testid="page-header"
keycloak={keycloak}
features={{ hasManageAccount: false }}
showNavToggle

2
js/libs/ui-shared/src/masthead/KeycloakDropdown.tsx
View file

@ -8,6 +8,7 @@ import { EllipsisVIcon } from "@patternfly/react-icons";
import { ReactNode, useState } from "react";
type KeycloakDropdownProps = Omit<DropdownProps, "toggle"> & {
"data-testid"?: string;
isKebab?: boolean;
title?: ReactNode;
dropDownItems: ReactNode[];
@ -29,6 +30,7 @@ export const KeycloakDropdown = ({
}}
toggle={(ref) => (
<MenuToggle
data-testid={`${rest["data-testid"]}-toggle`}
ref={ref}
onClick={() => setOpen(!open)}
isExpanded={open}

2
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractLoggedInPage.java
View file

@ -36,7 +36,7 @@ import static org.keycloak.testsuite.util.UIUtils.getTextFromElement;
public abstract class AbstractLoggedInPage extends AbstractAccountPage {
public static final String ACCOUNT_SECURITY_ID = "account-security";
@FindBy(xpath = "//div[@id='app']//header[@class='pf-v5-c-page__header']")
@FindBy(xpath = "//*[@data-testid='page-header']")
private LoggedInPageHeader header;
@FindBy(id = "page-sidebar")

14
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/AbstractHeader.java
View file

@ -43,24 +43,10 @@ public abstract class AbstractHeader extends AbstractFragmentWithMobileLayout {
assertToolsBtnVisible(expected, getLogoutBtn());
}
public void clickReferrerLink() {
clickToolsBtn(getReferrerLink());
}
public void assertReferrerLinkVisible(boolean expected) {
assertToolsBtnVisible(expected, getReferrerLink());
}
public String getReferrerLinkText() {
return getToolsBtnText(getReferrerLink());
}
public abstract void clickOptions();
protected abstract WebElement getLogoutBtn ();
protected abstract WebElement getReferrerLink();
protected void clickToolsBtn(WebElement btn) {
clickOptions();
clickLink(btn);

26
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/LoggedInPageHeader.java
View file

@ -27,40 +27,24 @@ import static org.keycloak.testsuite.util.UIUtils.getTextFromElement;
* @author Vaclav Muzikar <vmuzikar@redhat.com>
*/
public class LoggedInPageHeader extends AbstractHeader {
@FindBy(xpath = "//*[@data-testid='options']//a[text() = 'Sign out']")
@FindBy(xpath = "//*[@data-testid='page-header']//*[text() = 'Sign out']")
private WebElement logoutBtn;
@FindBy(xpath = "//*[@data-testid='options-kebab']//a[text() = 'Sign out']")
private WebElement logoutBtnMobile;
@FindBy(id = "referrerLink")
private WebElement referrerLink;
@FindBy(id = "referrerMobileLink")
private WebElement referrerLinkMobile;
@FindBy(xpath = "//*[@data-testid='options']")
@FindBy(xpath = "//*[@data-testid='options-toggle']")
private WebElement options;
@FindBy(xpath = "//*[@data-testid='options-kebab']")
private WebElement optionsMobile;
@FindBy(id = "loggedInUser")
private WebElement toolbarLoggedInUser;
@Override
public void clickOptions() {
clickLink(isMobileLayout() ? optionsMobile : options);
clickLink(options);
}
@Override
protected WebElement getLogoutBtn() {
return isMobileLayout() ? logoutBtnMobile : logoutBtn;
}
@Override
protected WebElement getReferrerLink() {
return isMobileLayout() ? referrerLinkMobile : referrerLink;
return logoutBtn;
}
public String getToolbarLoggedInUser() {
return getTextFromElement(toolbarLoggedInUser);
return getTextFromElement(options);
}
}