From 31ca70b0bb5af52cc810bfa3282a1b92200c49ba Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 18 Mar 2025 17:01:22 +0100
Subject: [PATCH] add scroll to top as an E2E test fix
---
.../vorgang-list/vorgang-list-pages.cy.ts | 68 ++++++-------------
.../vorgang-view-wiedervorlagen.pages.cy.ts | 16 ++++-
2 files changed, 36 insertions(+), 48 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pages.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pages.cy.ts
index 1018a1081b..45a24946fd 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pages.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pages.cy.ts
@@ -30,6 +30,7 @@ import {
dropCollections,
intercept,
scrollToWindowBottom,
+ scrollToWindowTop,
waitOfInterceptor,
} from '../../../support/cypress-helper';
import { generateIds } from '../../../support/tech.util';
@@ -72,13 +73,8 @@ describe('VorgangList Pages', () => {
it('should show 1 page with 100 vorgaenge NEU', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name === 'VorgangNEU_1',
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name ===
- 'VorgangNEU_' + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name === 'VorgangNEU_1');
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name === 'VorgangNEU_' + PAGE_SIZE);
});
});
});
@@ -95,14 +91,8 @@ describe('VorgangList Pages', () => {
waitOfInterceptor(loadNextPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name ===
- 'VorgangNEUAssigned_1',
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name ===
- 'VorgangNEUAssigned_' + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name === 'VorgangNEUAssigned_1');
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name === 'VorgangNEUAssigned_' + PAGE_SIZE);
});
waitForSpinnerToDisappear();
});
@@ -120,14 +110,8 @@ describe('VorgangList Pages', () => {
waitOfInterceptor(loadNextPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name ===
- 'VorgangANGENOMMEN_1',
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name ===
- 'VorgangANGENOMMEN_' + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name === 'VorgangANGENOMMEN_1');
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name === 'VorgangANGENOMMEN_' + PAGE_SIZE);
});
waitForSpinnerToDisappear();
});
@@ -140,20 +124,18 @@ describe('VorgangList Pages', () => {
intercept(HttpMethodE2E.GET, buildVorgangPageLink(4)).as(loadNextPageInterceptor);
});
+ after(() => {
+ scrollToWindowTop();
+ });
+
it('should show 3 page with 100 vorgaenge ANGENOMMEN ASSIGNED on scrolling to bottom', () => {
scrollToWindowBottom();
waitOfInterceptor(loadNextPageInterceptor).then((interception: Interception) => {
scrollToWindowBottom();
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name ===
- 'VorgangANGENOMMENAssigned_1',
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name ===
- 'VorgangANGENOMMENAssigned_' + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name === 'VorgangANGENOMMENAssigned_1');
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name === 'VorgangANGENOMMENAssigned_' + PAGE_SIZE);
});
});
});
@@ -176,14 +158,8 @@ describe('VorgangList Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name ===
- 'VorgangNEUAssigned_1',
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name ===
- 'VorgangNEUAssigned_' + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name === 'VorgangNEUAssigned_1');
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name === 'VorgangNEUAssigned_' + PAGE_SIZE);
});
});
});
@@ -195,19 +171,17 @@ describe('VorgangList Pages', () => {
intercept(HttpMethodE2E.GET, buildVorgangPageLink(2)).as(loadNextPageInterceptor);
});
+ after(() => {
+ scrollToWindowTop();
+ });
+
it('should show 2 page with 100 vorgaenge ANGENOMMEN ASSIGNED on scrolling to bottom', () => {
scrollToWindowBottom();
waitOfInterceptor(loadNextPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name ===
- 'VorgangANGENOMMENAssigned_1',
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name ===
- 'VorgangANGENOMMENAssigned_' + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name === 'VorgangANGENOMMENAssigned_1');
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name === 'VorgangANGENOMMENAssigned_' + PAGE_SIZE);
});
waitForSpinnerToDisappear();
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts
index c1ffd8afac..db83669a5b 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts
@@ -31,7 +31,13 @@ import { VorgangViewsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/v
import { HttpMethodE2E } from 'apps/alfa-e2e/src/model/util';
import { ClientAttributeNameE2E, VorgangE2E } from 'apps/alfa-e2e/src/model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from 'apps/alfa-e2e/src/page-objects/main.po';
-import { dropCollections, intercept, scrollToWindowBottom, waitOfInterceptor } from 'apps/alfa-e2e/src/support/cypress-helper';
+import {
+ dropCollections,
+ intercept,
+ scrollToWindowBottom,
+ scrollToWindowTop,
+ waitOfInterceptor,
+} from 'apps/alfa-e2e/src/support/cypress-helper';
import { exist } from 'apps/alfa-e2e/src/support/cypress.util';
import { createDateToday, generateIds } from 'apps/alfa-e2e/src/support/tech.util';
import { getUserSabineId, initUsermanagerUsers, loginAsSabine } from 'apps/alfa-e2e/src/support/user-util';
@@ -161,6 +167,10 @@ describe('VorgangList View Wiedervorlagen', () => {
intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenPageLink(3)).as(loadPageInterceptor);
});
+ after(() => {
+ scrollToWindowTop();
+ });
+
it('should show 3 page with 10 vorgaenge with open wiedervorlagen ASSIGNED on scrolling to bottom', () => {
scrollToWindowBottom();
@@ -203,6 +213,10 @@ describe('VorgangList View Wiedervorlagen', () => {
intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenAssignedPageLink(2)).as(loadPageInterceptor);
});
+ after(() => {
+ scrollToWindowTop();
+ });
+
it('should show 2 page with 10 vorgaenge with open wiedervorlagen and 90 vorgaenge with open wiedervorlagen ASSIGNED on scrolling to bottom', () => {
scrollToWindowBottom();
--
GitLab