From 94d2c1b41de5c3cc116e84151e95d654665d072c Mon Sep 17 00:00:00 2001
From: Albert Bruns <albert.bruns@mgm-tp.com>
Date: Wed, 19 Feb 2025 15:02:58 +0000
Subject: [PATCH] e2e-tests-reparieren
---
.../vorgang-detailansicht/vorgang-abschliessen.cy.ts | 7 ++-----
.../vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts | 6 +-----
alfa-client/apps/alfa-e2e/src/support/cypress.util.ts | 7 +++----
.../ui/src/lib/ui/progress-bar/progress-bar.component.ts | 4 ++--
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
index 81bbd0cdfb..e7cbc9d44d 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-abschliessen.cy.ts
@@ -27,7 +27,7 @@ import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-lis
import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections, wait } from '../../../support/cypress-helper';
+import { dropCollections } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
import { buildVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
@@ -132,15 +132,12 @@ describe('Vorgang abschliessen', () => {
it('should close snackbar on revoke', () => {
snackBar.getRevokeButton().click();
- wait(500);
waitForSpinnerToDisappear();
-
notExist(snackBar.getMessage());
});
- it.skip('UNSTABLE: should show status Beschieden', () => {
+ it('should show status Beschieden', () => {
notExist(vorgangPage.getProgressBar());
-
haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.BESCHIEDEN]);
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
index 246013c7b1..a589537f1b 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedereroeffnen.cy.ts
@@ -27,7 +27,7 @@ import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-lis
import { VorgangE2E, VorgangMessagesE2E, VorgangStatusE2E, vorgangStatusLabelE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections, wait } from '../../../support/cypress-helper';
+import { dropCollections } from '../../../support/cypress-helper';
import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
@@ -137,8 +137,6 @@ describe('Vorgang wiedereroeffnen', () => {
describe('by icon-button', () => {
it('should have status Beschieden', () => {
- wait(500);
-
haveText(
vorgangPage.getVorgangDetailHeader().getStatus(),
vorgangStatusLabelE2E[vorgangBeschiedenWiedereroeffnenRevoke.status],
@@ -155,7 +153,6 @@ describe('Vorgang wiedereroeffnen', () => {
it('should click on snackbar revoke', () => {
snackbar.getRevokeButton().click();
- wait(500);
waitForSpinnerToDisappear();
notExist(snackbar.getMessage());
@@ -261,7 +258,6 @@ describe('Vorgang wiedereroeffnen', () => {
it('should click snackbar revoke', () => {
snackbar.getRevokeButton().click();
- wait(500);
waitForSpinnerToDisappear();
notExist(snackbar.getMessage());
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
index 69e7bccdfc..3dbd615593 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
@@ -46,10 +46,9 @@ export function notExist(element: any): void {
}
export function haveText(element: any, text: string): void {
- element
- .invoke('text')
- .then((elementText) => elementText.trim())
- .should('equal', text);
+ element.invoke('text').should(($text) => {
+ expect($text.trim()).to.equal(text);
+ });
}
export function haveTextWithoutChildren(element: any, text: string): void {
diff --git a/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts b/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
index 0ce2009d9f..185fa2810d 100644
--- a/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
+++ b/alfa-client/libs/ui/src/lib/ui/progress-bar/progress-bar.component.ts
@@ -23,7 +23,7 @@
*/
import { createEmptyStateResource, StateResource } from '@alfa-client/tech-shared';
import { Component, Input } from '@angular/core';
-import { MatProgressBar } from '@angular/material/progress-bar';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
import { Resource } from '@ngxp/rest';
@Component({
@@ -31,7 +31,7 @@ import { Resource } from '@ngxp/rest';
templateUrl: './progress-bar.component.html',
styleUrls: ['./progress-bar.component.scss'],
standalone: true,
- imports: [MatProgressBar],
+ imports: [MatProgressBarModule],
})
export class ProgressBarComponent {
@Input() stateResource: StateResource<Resource> = createEmptyStateResource<Resource>();
--
GitLab