From fb32b1543e834cf1b3296a17eaa27d6c5a60c4ed Mon Sep 17 00:00:00 2001
From: cord <cord.westhoff@mgm-tp.com>
Date: Mon, 13 Jan 2025 13:48:43 +0100
Subject: [PATCH] OZG-7405 OZG-7416 fix E2E for new popup buttons
---
.../components/user-assistance/help-menu.component.e2e.ts | 5 +++++
.../user-profile/current-user-profile.component.e2e.ts | 5 +++++
.../src/e2e/main-tests/accessibility/vorgang-list.cy.ts | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/src/components/user-assistance/help-menu.component.e2e.ts b/alfa-client/apps/alfa-e2e/src/components/user-assistance/help-menu.component.e2e.ts
index a31c1a7020..04851d1ee4 100644
--- a/alfa-client/apps/alfa-e2e/src/components/user-assistance/help-menu.component.e2e.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/user-assistance/help-menu.component.e2e.ts
@@ -24,6 +24,7 @@
export class HelpMenuE2EComponent {
private readonly root: string = 'help-menu';
private readonly button: string = 'help-menu-button';
+ private readonly dropdownButton: string ='dropdown-button';
private readonly openDocumentationButton: string = 'open-documentation-button';
public getRoot() {
@@ -34,6 +35,10 @@ export class HelpMenuE2EComponent {
return this.getRoot().getTestElementWithOid(this.button);
}
+ public getDropdownButton() {
+ return this.getRoot().getTestElement(this.dropdownButton);
+ }
+
public getOpenDocumentationButton() {
return this.getRoot().getTestElementWithOid(this.openDocumentationButton);
}
diff --git a/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts b/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts
index 131a36af24..202c5d3ef5 100644
--- a/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/user-profile/current-user-profile.component.e2e.ts
@@ -28,6 +28,7 @@ export class CurrentUserProfileE2EComponent {
private readonly locatorLogoutButton: string = 'logout-button';
private readonly locatorRoot: string = 'current-user';
+ private readonly dropdownButton: string = 'dropdown-button';
public getRoot() {
return cy.getTestElement(this.locatorRoot);
@@ -46,6 +47,10 @@ export class CurrentUserProfileE2EComponent {
return cy.getTestElement(this.locatorUserIconButton);
}
+ public getDropdownButton() {
+ return this.getRoot().getTestElement(this.dropdownButton);
+ }
+
public getLogoutButton() {
return cy.getTestElement(this.locatorLogoutButton);
}
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts
index 785e9ad2b8..47c1fa4753 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts
@@ -94,7 +94,7 @@ describe('VorgangList Page', () => {
it('should focus help menu icon', () => {
pressTab();
- isKeyboardFocused(header.getHelpMenu().getButton());
+ isOdsFocused(header.getHelpMenu().getDropdownButton());
});
it('should focus settings icon', () => {
@@ -106,7 +106,7 @@ describe('VorgangList Page', () => {
it('should focus user icon', () => {
pressTab();
- isKeyboardFocused(header.getCurrentUserProfile().getUserIconButton());
+ isOdsFocused(header.getCurrentUserProfile().getDropdownButton());
});
});
--
GitLab