From 45924c77a0dcfdb65c6bcef752c8b6f75b652c31 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 10 Dec 2024 16:14:57 +0100
Subject: [PATCH] OZG-7021 improve tests

---
 .../src/e2e/main-tests/app/0-login-logout.cy.ts      |  6 ++++--
 .../apps/admin-e2e/src/page-objects/login.po.ts      | 12 ++++++++++++
 .../src/e2e/main-tests/app/login-logout.cy.ts        |  6 ++++--
 .../apps/alfa-e2e/src/page-objects/login.po.ts       | 12 ++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 alfa-client/apps/admin-e2e/src/page-objects/login.po.ts
 create mode 100644 alfa-client/apps/alfa-e2e/src/page-objects/login.po.ts

diff --git a/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/0-login-logout.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/0-login-logout.cy.ts
index f1cb91d789..d4067cb06b 100644
--- a/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/0-login-logout.cy.ts
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/app/0-login-logout.cy.ts
@@ -22,18 +22,20 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { HeaderE2EComponent } from '../../../page-objects/header.po';
+import { LoginPage } from '../../../page-objects/login.po';
 import { MainPage } from '../../../page-objects/main.po';
 import { reload } from '../../../support/cypress-helper';
 import { exist } from '../../../support/cypress.util';
 import { loginByUi } from '../../../support/user-util';
 
 describe('Login and Logout', () => {
+  const loginPage: LoginPage = new LoginPage();
   const mainPage: MainPage = new MainPage();
   const header: HeaderE2EComponent = mainPage.getHeader();
 
   it('should display accessibility link', () => {
     cy.visit('');
-    exist(cy.get('#kc-barrierefreiheit'));
+    exist(loginPage.getBarrierefreiheitLink());
   });
 
   it('login as Ariane', () => {
@@ -56,7 +58,7 @@ describe('Login and Logout', () => {
   it('should logout', () => {
     header.getCurrentUserProfile().logout();
 
-    exist(cy.get('#kc-login'));
+    exist(loginPage.getLogin());
 
     Cypress.session.clearAllSavedSessions();
   });
diff --git a/alfa-client/apps/admin-e2e/src/page-objects/login.po.ts b/alfa-client/apps/admin-e2e/src/page-objects/login.po.ts
new file mode 100644
index 0000000000..e44d469b42
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/src/page-objects/login.po.ts
@@ -0,0 +1,12 @@
+export class LoginPage {
+  private readonly locatorLogin: string = '#kc-login';
+  private readonly locatorBarrierefreiheitLink: string = '#kc-barrierefreiheit';
+
+  public getLogin() {
+    return cy.get(this.locatorLogin);
+  }
+
+  public getBarrierefreiheitLink() {
+    return cy.get(this.locatorBarrierefreiheitLink);
+  }
+}
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/app/login-logout.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/app/login-logout.cy.ts
index 3b611d20cf..4cb982be46 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/app/login-logout.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/app/login-logout.cy.ts
@@ -26,6 +26,7 @@ import { getApp } from 'apps/alfa-e2e/src/support/app-util';
 import { reload } from 'apps/alfa-e2e/src/support/cypress-helper';
 import { UserE2E } from '../../../model/user';
 import { HeaderE2EComponent } from '../../../page-objects/header.po';
+import { LoginPage } from '../../../page-objects/login.po';
 import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
 import { exist } from '../../../support/cypress.util';
 import { getUserSabine } from '../../../support/user-util';
@@ -34,6 +35,7 @@ describe('Login and Logout', () => {
   const app: App = getApp();
   const user: UserE2E = getUserSabine();
 
+  const loginPage: LoginPage = new LoginPage();
   const mainPage: MainPage = new MainPage();
   const header: HeaderE2EComponent = mainPage.getHeader();
 
@@ -42,7 +44,7 @@ describe('Login and Logout', () => {
   });
 
   it('should display accessibility link', () => {
-    exist(cy.get('#kc-barrierefreiheit'));
+    exist(loginPage.getBarrierefreiheitLink());
   });
 
   it('login as test user', () => {
@@ -73,6 +75,6 @@ describe('Login and Logout', () => {
   it('should logout', () => {
     header.getCurrentUserProfile().logout();
 
-    exist(cy.get('#kc-login'));
+    exist(loginPage.getLogin());
   });
 });
diff --git a/alfa-client/apps/alfa-e2e/src/page-objects/login.po.ts b/alfa-client/apps/alfa-e2e/src/page-objects/login.po.ts
new file mode 100644
index 0000000000..e44d469b42
--- /dev/null
+++ b/alfa-client/apps/alfa-e2e/src/page-objects/login.po.ts
@@ -0,0 +1,12 @@
+export class LoginPage {
+  private readonly locatorLogin: string = '#kc-login';
+  private readonly locatorBarrierefreiheitLink: string = '#kc-barrierefreiheit';
+
+  public getLogin() {
+    return cy.get(this.locatorLogin);
+  }
+
+  public getBarrierefreiheitLink() {
+    return cy.get(this.locatorBarrierefreiheitLink);
+  }
+}
-- 
GitLab