From 0a3e40c87fbabfdbd7f0fd53f373e254c0431327 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Thu, 27 Feb 2025 13:15:25 +0100
Subject: [PATCH] OZG-7798 adjust dataTestId after merge; remove suffx from
text component
---
.../statistik/statistik-fields-form.e2e.component.ts | 6 +++---
.../src/components/statistik/statistik.e2e.component.ts | 2 +-
.../admin-e2e/src/e2e/main-tests/navigation/daria.cy.ts | 4 ++--
.../admin-e2e/src/e2e/main-tests/navigation/safira.cy.ts | 4 ++--
.../admin-cancel-button/admin-cancel-button.component.html | 2 +-
.../admin-delete-open-dialog-button.component.html | 4 ++--
.../lib/admin-save-button/admin-save-button.component.html | 7 ++++++-
.../statistik-container/statistik-container.component.html | 2 +-
.../admin-statistik-fields-form.component.html | 2 +-
.../statistik-fields-form-mapping.component.html | 4 ++--
.../statistik-fields-form-mapping.component.spec.ts | 2 +-
.../user-form-save-button.component.html | 2 +-
.../src/lib/routing-button/routing-button.component.ts | 6 +-----
.../libs/design-system/src/lib/button/button.component.ts | 2 +-
14 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts
index 10e22808cd..8936e02edb 100644
--- a/alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts
+++ b/alfa-client/apps/admin-e2e/src/components/statistik/statistik-fields-form.e2e.component.ts
@@ -5,9 +5,9 @@ export class StatistikFieldsFormE2EComponent {
private readonly formIdInput: string = 'form-id-text-input';
private readonly formDataFieldInput: string = 'mapping-field-';
private readonly addDataFieldButton: string = 'add-mapping-button';
- private readonly deleteDataFieldButtonPrefix: string = 'remove-mapping-';
+ private readonly deleteDataFieldButtonPrefix: string = 'remove-mapping-button-';
private readonly saveButton: string = 'save-button';
- private readonly cancelButton: string = 'cancel-routing-button';
+ private readonly cancelButton: string = 'cancel-button';
public getFormEngineInput(): Cypress.Chainable<Element> {
return cy.getTestElement(this.formEngineInput);
@@ -42,7 +42,7 @@ export class StatistikFieldsFormE2EComponent {
}
public getDataFieldDeleteButton(index: number): Cypress.Chainable<Element> {
- return cy.getTestElement(this.deleteDataFieldButtonPrefix + index + '-button');
+ return cy.getTestElement(this.deleteDataFieldButtonPrefix + index);
}
public deleteDataField(index: number): void {
diff --git a/alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts b/alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts
index 44ee45b83d..b7467232f5 100644
--- a/alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts
+++ b/alfa-client/apps/admin-e2e/src/components/statistik/statistik.e2e.component.ts
@@ -1,6 +1,6 @@
export class StatistikE2EComponent {
private readonly locatorHeaderText: string = 'statistik-header-text';
- private readonly locatorWeitereFelderAuswertenButton = 'weitere-felder-auswerten-routing-button';
+ private readonly locatorWeitereFelderAuswertenButton = 'weitere-felder-auswerten-button';
public getHeaderText(): Cypress.Chainable<Element> {
return cy.getTestElement(this.locatorHeaderText);
diff --git a/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/daria.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/daria.cy.ts
index 5786756897..33a06a73b8 100644
--- a/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/daria.cy.ts
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/daria.cy.ts
@@ -1,5 +1,5 @@
import { MainPage, waitForSpinnerToDisappear } from 'apps/admin-e2e/src/page-objects/main.po';
-import { exist, notExist } from 'apps/admin-e2e/src/support/cypress.util';
+import { exist, notExist, visible } from 'apps/admin-e2e/src/support/cypress.util';
import { loginAsDaria } from 'apps/admin-e2e/src/support/user-util';
import { StatistikE2EComponent } from '../../../components/statistik/statistik.e2e.component';
@@ -37,7 +37,7 @@ describe('Navigation', () => {
});
it('should show header text', () => {
- statistikPage.isHeaderTextVisible();
+ visible(statistikPage.getHeaderText());
});
});
});
diff --git a/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/safira.cy.ts b/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/safira.cy.ts
index 6f76dafdfc..005da2e5a5 100644
--- a/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/safira.cy.ts
+++ b/alfa-client/apps/admin-e2e/src/e2e/main-tests/navigation/safira.cy.ts
@@ -1,5 +1,5 @@
import { MainPage, waitForSpinnerToDisappear } from 'apps/admin-e2e/src/page-objects/main.po';
-import { exist } from 'apps/admin-e2e/src/support/cypress.util';
+import { exist, visible } from 'apps/admin-e2e/src/support/cypress.util';
import { loginAsSafira } from 'apps/admin-e2e/src/support/user-util';
import { StatistikE2EComponent } from '../../../components/statistik/statistik.e2e.component';
@@ -38,7 +38,7 @@ describe('Navigation', () => {
});
it('should show page on selection', () => {
- statistikPage.isHeaderTextVisible();
+ visible(statistikPage.getHeaderText());
});
it('should mark navigation item as selected', () => {
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html
index 699dd5d88c..3125fbdfd9 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html
+++ b/alfa-client/libs/admin/shared/src/lib/admin-cancel-button/admin-cancel-button.component.html
@@ -1,3 +1,3 @@
-<ods-routing-button [linkPath]="linkPath" text="Abbrechen" variant="outline" dataTestId="cancel">
+<ods-routing-button [linkPath]="linkPath" text="Abbrechen" variant="outline" dataTestId="cancel-button">
<ods-close-icon icon class="fill-primary" />
</ods-routing-button>
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
index 3577b2352d..c006d95c84 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
+++ b/alfa-client/libs/admin/shared/src/lib/admin-delete-open-dialog-button/admin-delete-open-dialog-button.component.html
@@ -1,3 +1,3 @@
-<ods-open-dialog-button variant='outline_error' label="Löschen" dataTestId="delete-button" >
+<ods-open-dialog-button variant="outline_error" label="Löschen" dataTestId="delete-button">
<ods-delete-icon icon />
-</ods-open-dialog-button>
\ No newline at end of file
+</ods-open-dialog-button>
diff --git a/alfa-client/libs/admin/shared/src/lib/admin-save-button/admin-save-button.component.html b/alfa-client/libs/admin/shared/src/lib/admin-save-button/admin-save-button.component.html
index af15df102e..8bd6a5f929 100644
--- a/alfa-client/libs/admin/shared/src/lib/admin-save-button/admin-save-button.component.html
+++ b/alfa-client/libs/admin/shared/src/lib/admin-save-button/admin-save-button.component.html
@@ -1 +1,6 @@
-<ods-button-with-spinner (clickEmitter)="submit()" text="Speichern" dataTestId="save" [stateResource]="stateResource$ | async" />
+<ods-button-with-spinner
+ (clickEmitter)="submit()"
+ text="Speichern"
+ dataTestId="save-button"
+ [stateResource]="stateResource$ | async"
+/>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
index de734eb765..1fd0441a39 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-container/statistik-container.component.html
@@ -28,7 +28,7 @@
<ods-routing-button
[linkPath]="ROUTES.STATISTIK_NEU"
text="Weitere Felder auswerten"
- dataTestId="weitere-felder-auswerten"
+ dataTestId="weitere-felder-auswerten-button"
></ods-routing-button>
</div>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html
index 088a142053..ce24e7184c 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/admin-statistik-fields-form.component.html
@@ -22,7 +22,7 @@
</form>
<ods-button
text="Datenfeld hinzufügen"
- dataTestId="add-mapping"
+ dataTestId="add-mapping-button"
data-test-id="add-mapping"
(clickEmitter)="formService.addMapping()"
>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.html b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.html
index 19185cc85a..569fc993f6 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.html
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.html
@@ -19,8 +19,8 @@
size="fit"
destructive="true"
(clickEmitter)="formService.removeMapping(i)"
- [dataTestId]="'remove-mapping-' + i"
- [attr.data-test-id]="'remove-mapping-button-' + i"
+ [dataTestId]="'remove-mapping-button-' + i"
+ [attr.data-test-id]="'remove-mapping-' + i"
>
<ods-delete-icon icon />
</ods-button>
diff --git a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.spec.ts b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.spec.ts
index 9d96ff2602..d06746e48f 100644
--- a/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.spec.ts
+++ b/alfa-client/libs/admin/statistik/src/lib/statistik-fields-form/statistik-fields-form-mapping/statistik-fields-form-mapping.component.spec.ts
@@ -15,7 +15,7 @@ describe('AdminStatistikFieldsFormMappingComponent', () => {
let fixture: ComponentFixture<AdminStatistikFieldsFormMappingComponent>;
const mappingField: string = getDataTestIdOf('mapping-field-0');
- const removeMappingButton: string = getDataTestIdOf('remove-mapping-button-0');
+ const removeMappingButton: string = getDataTestIdOf('remove-mapping-0');
const formBuilder: FormBuilder = new FormBuilder();
diff --git a/alfa-client/libs/admin/user/src/lib/user-form/user-form-save-button/user-form-save-button.component.html b/alfa-client/libs/admin/user/src/lib/user-form/user-form-save-button/user-form-save-button.component.html
index 0277da75db..064289aa47 100644
--- a/alfa-client/libs/admin/user/src/lib/user-form/user-form-save-button/user-form-save-button.component.html
+++ b/alfa-client/libs/admin/user/src/lib/user-form/user-form-save-button/user-form-save-button.component.html
@@ -3,4 +3,4 @@
(clickEmitter)="submit()"
text="Speichern"
dataTestId="save-button"
-/>
\ No newline at end of file
+/>
diff --git a/alfa-client/libs/design-component/src/lib/routing-button/routing-button.component.ts b/alfa-client/libs/design-component/src/lib/routing-button/routing-button.component.ts
index 258b5ff47c..98346f3903 100644
--- a/alfa-client/libs/design-component/src/lib/routing-button/routing-button.component.ts
+++ b/alfa-client/libs/design-component/src/lib/routing-button/routing-button.component.ts
@@ -8,11 +8,7 @@ import { ButtonVariants, buttonVariants } from '@ods/system';
standalone: true,
imports: [CommonModule, RouterLink],
host: { class: 'block' },
- template: `<a
- [routerLink]="'/' + linkPath"
- [attr.data-test-id]="dataTestId + '-routing-button'"
- [ngClass]="buttonVariants({ size, variant })"
- >
+ template: `<a [routerLink]="'/' + linkPath" [attr.data-test-id]="dataTestId" [ngClass]="buttonVariants({ size, variant })">
<ng-content select="[icon]" />
@if (text) {
<p class="flex-grow">{{ text }}</p>
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index f41d9d4f6b..c0f7892c3c 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -95,7 +95,7 @@ export type ButtonVariants = VariantProps<typeof buttonVariants>;
[disabled]="isDisabled"
[attr.aria-disabled]="isDisabled"
[attr.aria-label]="text"
- [attr.data-test-id]="dataTestId + '-button'"
+ [attr.data-test-id]="dataTestId"
(click)="clickEmitter.emit()"
>
<ng-content *ngIf="!isLoading" select="[icon]"></ng-content>
--
GitLab