From 4c54e913c0a8a7b3a11e26022c7ba5cb5ada7334 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 26 Nov 2024 14:47:51 +0100
Subject: [PATCH] OZG-7237 revert spinner
---
.../vorgang-detail/vorgang-zurueckholen.ea.cy.ts | 2 ++
alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts | 2 +-
alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts
index fa9b70e38f..adf5bb79d4 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-zurueckholen.ea.cy.ts
@@ -56,6 +56,7 @@ describe('Vorgang Zurueckholen', () => {
};
before(() => {
+ dropCollections();
initVorgaenge([vorgangZurueckholen, vorgangZurueckholenRevoke]);
loginAsEmil();
@@ -146,6 +147,7 @@ describe('Vorgang Zurueckholen', () => {
it('should show status Verworfen after progressbar dissapear', () => {
notExist(vorgangPage.getProgressBar());
+ waitForSpinnerToDisappear();
haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[VorgangStatusE2E.VERWORFEN]);
});
diff --git a/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts b/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts
index 299d28b5a0..f9c6a11705 100644
--- a/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts
+++ b/alfa-client/apps/alfa-e2e/src/page-objects/main.po.ts
@@ -96,7 +96,7 @@ export class MainPage {
}
export function waitForSpinnerToDisappear(): boolean {
- return cy.getTestElementWithClass('spinner-content').should('not.exist');
+ return cy.getTestElementWithClass('spinner').should('not.exist');
}
export function waitforSpinnerToAppear(): void {
diff --git a/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html b/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html
index 7d747d7685..7218921767 100644
--- a/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html
+++ b/alfa-client/libs/ui/src/lib/ui/spinner/spinner.component.html
@@ -23,8 +23,8 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
-<div *ngIf="showSpinner" data-test-class="spinner" class="spinner" [style.padding]="padding + 'px'">
- <mat-spinner [diameter]="diameter"></mat-spinner>
+<div *ngIf="showSpinner" class="spinner" [style.padding]="padding + 'px'">
+ <mat-spinner [diameter]="diameter" data-test-class="spinner"> </mat-spinner>
<span *ngIf="text">{{ text }}</span>
</div>
--
GitLab