From 497dea04fd457b080d2c539f3dc83088af16201e Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Feb 2025 16:07:58 +0100
Subject: [PATCH 1/8] OZG-7474 fix data test id for zuruecholen button
---
.../zurueckholen-button/zurueckholen-button.component.html | 4 ++--
.../zurueckholen-button.component.spec.ts | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
index 3fd57ccdb2..4f41c6a5a1 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
@@ -27,7 +27,7 @@
@if (showAsIconButton) {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="zurueckholen-icon-button"
+ dataTestId="zurueckholen-icon-button"
variant="ghost"
size="fit"
tooltip="Vorgang zurückholen"
@@ -38,7 +38,7 @@
} @else {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="zurueckholen-button"
+ dataTestId="zurueckholen-button"
text="Vorgang zurückholen"
variant="outline"
(clickEmitter)="zurueckholen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
index 3a1cd90115..f91b5423f7 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { UndoIconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -38,8 +38,8 @@ describe('ZurueckholenButtonComponent', () => {
let component: ZurueckholenButtonComponent;
let fixture: ComponentFixture<ZurueckholenButtonComponent>;
- const zurueckholenButton: string = getDataTestIdOf('zurueckholen-button');
- const zurueckholenIconButton: string = getDataTestIdOf('zurueckholen-icon-button');
+ const zurueckholenButton: string = getDataTestIdAttributeOf('zurueckholen-button');
+ const zurueckholenIconButton: string = getDataTestIdAttributeOf('zurueckholen-icon-button');
const vorgangCommandService = {
...mock(VorgangCommandService),
--
GitLab
From d8b394f112d8382d8b6e3350772289c18e13787f Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Feb 2025 16:09:37 +0100
Subject: [PATCH 2/8] OZG-7474 fix verwerfen button data test id
---
.../verwerfen-button/verwerfen-button.component.html | 4 ++--
.../verwerfen-button/verwerfen-button.component.spec.ts | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
index 8d663e5e9b..784ddfbbf3 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
@@ -27,7 +27,7 @@
@if (showAsIconButton) {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="verwerfen-icon-button"
+ dataTestId="verwerfen-icon-button"
tooltip="Vorgang verwerfen"
variant="ghost"
size="fit"
@@ -38,7 +38,7 @@
} @else {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="verwerfen-button"
+ dataTestId="verwerfen-button"
text="Verwerfen"
variant="outline"
(clickEmitter)="verwerfen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
index ebdb6df88b..75b739a230 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { DiscardVorgangIconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -38,8 +38,8 @@ describe('VerwerfenButtonComponent', () => {
let component: VerwerfenButtonComponent;
let fixture: ComponentFixture<VerwerfenButtonComponent>;
- const verwerfenButton: string = getDataTestIdOf('verwerfen-button');
- const verwerfenIconButton: string = getDataTestIdOf('verwerfen-icon-button');
+ const verwerfenButton: string = getDataTestIdAttributeOf('verwerfen-button');
+ const verwerfenIconButton: string = getDataTestIdAttributeOf('verwerfen-icon-button');
const vorgangCommandService = {
...mock(VorgangCommandService),
--
GitLab
From 08f6036be936b3253c3ce8c7dd79856e8a94331b Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 11 Feb 2025 16:09:47 +0100
Subject: [PATCH 3/8] OZG-7474 Fix data test ids - postfach mail button -
wiederoeffnen button
---
.../postfach-mail-button.component.html | 12 +++++++-----
.../postfach-mail-button.component.spec.ts | 8 ++++----
.../wiedereroeffnen-button.component.html | 4 ++--
.../wiedereroeffnen-button.component.spec.ts | 6 +++---
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
index 8a29c815b6..440eb0b7fe 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
@@ -27,7 +27,7 @@
<!-- TODO Aufteilen in 3 einzelne Komponenten -->
@if (showAsIconButton) {
<ods-button
- data-test-id="send-mail-icon-button"
+ dataTestId="send-mail-icon-button"
[isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
tooltip="Neue Nachricht erstellen"
variant="ghost"
@@ -36,9 +36,10 @@
>
<ods-mailbox-icon icon />
</ods-button>
- } @else if (text && !toolTip) {
+ }
+ @if (!showAsIconButton && text && !toolTip) {
<ods-button
- data-test-id="create-mail-button-with-text"
+ dataTestId="create-mail-button-with-text"
[isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
[text]="text"
variant="outline"
@@ -46,9 +47,10 @@
>
<ods-plus-icon icon />
</ods-button>
- } @else if (!text && toolTip) {
+ }
+ @if (!showAsIconButton && !text && toolTip) {
<ods-button
- data-test-id="create-mail-button-without-text"
+ dataTestId="create-mail-button-without-text"
[isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
[tooltip]="toolTip"
variant="ghost"
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
index d02565a847..10a405d105 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
@@ -28,7 +28,7 @@ import { faker } from '@faker-js/faker';
import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
import { createPostfachMailListResource } from 'libs/postfach-shared/test/postfach';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { MockComponent, MockDirective } from 'ng-mocks';
import { PostfachMailButtonComponent } from './postfach-mail-button.component';
@@ -36,9 +36,9 @@ describe('PostfachMailButtonComponent', () => {
let component: PostfachMailButtonComponent;
let fixture: ComponentFixture<PostfachMailButtonComponent>;
- const sendMailButtonWithText: string = getDataTestIdOf('create-mail-button-with-text');
- const sendMailButtonWithoutText: string = getDataTestIdOf('create-mail-button-without-text');
- const sendMailIconButton: string = getDataTestIdOf('send-mail-icon-button');
+ const sendMailButtonWithText: string = getDataTestIdAttributeOf('create-mail-button-with-text');
+ const sendMailButtonWithoutText: string = getDataTestIdAttributeOf('create-mail-button-without-text');
+ const sendMailIconButton: string = getDataTestIdAttributeOf('send-mail-icon-button');
beforeEach(async () => {
await TestBed.configureTestingModule({
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
index 51b70df609..0e3bba543b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
@@ -27,7 +27,7 @@
@if (showAsIconButton) {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="wiedereroeffnen-icon-button"
+ dataTestId="wiedereroeffnen-icon-button"
tooltip="Vorgang wiedereröffnen"
variant="ghost"
size="fit"
@@ -38,7 +38,7 @@
} @else {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="wiedereroeffnen-button"
+ dataTestId="wiedereroeffnen-button"
text="Wiedereröffnen"
variant="outline"
(clickEmitter)="wiedereroeffnen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
index 3ee20a3ec3..a522800052 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { UndoIconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -37,8 +37,8 @@ import { WiedereroeffnenButtonComponent } from './wiedereroeffnen-button.compone
describe('WiedereroeffnenButtonComponent', () => {
let component: WiedereroeffnenButtonComponent;
let fixture: ComponentFixture<WiedereroeffnenButtonComponent>;
- const wiedereroeffnenButton: string = getDataTestIdOf('wiedereroeffnen-button');
- const wiedereroeffnenIconButton: string = getDataTestIdOf('wiedereroeffnen-icon-button');
+ const wiedereroeffnenButton: string = getDataTestIdAttributeOf('wiedereroeffnen-button');
+ const wiedereroeffnenIconButton: string = getDataTestIdAttributeOf('wiedereroeffnen-icon-button');
const vorgangCommandService = {
...mock(VorgangCommandService),
--
GitLab
From 6733afe93ddf8f5395cddbd709a4c1c42fbbdb50 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Feb 2025 16:11:24 +0100
Subject: [PATCH 4/8] OZG-7474 fix bearbeiten button data test id
---
.../bearbeiten-button/bearbeiten-button.component.html | 4 ++--
.../bearbeiten-button/bearbeiten-button.component.spec.ts | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
index d1de12ab8c..107e3f67c2 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
@@ -28,7 +28,7 @@
@if (showAsIconButton) {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="bearbeiten-icon-button"
+ dataTestId="bearbeiten-icon-button"
tooltip="Vorgang bearbeiten"
variant="ghost"
size="fit"
@@ -39,7 +39,7 @@
} @else {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="bearbeiten-button"
+ dataTestId="bearbeiten-button"
text="Bearbeiten"
variant="outline"
(clickEmitter)="bearbeiten()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
index 627aa0b059..9691ba2813 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
@@ -28,6 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { EditIconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -37,8 +38,8 @@ describe('BearbeitenButtonComponent', () => {
let component: BearbeitenButtonComponent;
let fixture: ComponentFixture<BearbeitenButtonComponent>;
- const bearbeitenButton: string = '[data-test-id="bearbeiten-button"]';
- const bearbeitenIconButton: string = '[data-test-id="bearbeiten-icon-button"]';
+ const bearbeitenButton: string = getDataTestIdAttributeOf('bearbeiten-button');
+ const bearbeitenIconButton: string = getDataTestIdAttributeOf('bearbeiten-icon-button');
const vorgangCommandService = {
...mock(VorgangCommandService),
--
GitLab
From 50abe80812e6c9ad5acf55fbd907623292544724 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Feb 2025 16:13:00 +0100
Subject: [PATCH 5/8] OZG-7474 fix annehmen button data test id
---
.../buttons/annehmen-button/annehmen-button.component.html | 4 ++--
.../annehmen-button/annehmen-button.component.spec.ts | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
index e3113ba3b2..7e55b9639e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
@@ -31,7 +31,7 @@
tooltip="Vorgang annehmen"
variant="ghost"
size="fit"
- data-test-id="annehmen-icon-button"
+ dataTestId="annehmen-icon-button"
>
<ods-check-circle-icon icon class="fill-text" />
</ods-button-with-spinner>
@@ -41,7 +41,7 @@
(clickEmitter)="annehmen()"
text="Annehmen"
variant="outline"
- data-test-id="annehmen-button"
+ dataTestId="annehmen-button"
>
<ods-check-circle-icon icon />
</ods-button-with-spinner>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
index 8e531074e2..0b4059086f 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
@@ -29,7 +29,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -39,8 +39,8 @@ describe('AnnehmenButtonComponent', () => {
let component: AnnehmenButtonComponent;
let fixture: ComponentFixture<AnnehmenButtonComponent>;
- const annehmenButton: string = getDataTestIdOf('annehmen-button');
- const annehmenIconButton: string = getDataTestIdOf('annehmen-icon-button');
+ const annehmenButton: string = getDataTestIdAttributeOf('annehmen-button');
+ const annehmenIconButton: string = getDataTestIdAttributeOf('annehmen-icon-button');
const vorgangCommandService = {
...mock(VorgangCommandService),
--
GitLab
From 4404de34e278542363f8e9fd5d343d3ddacb564c Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Feb 2025 16:14:49 +0100
Subject: [PATCH 6/8] OZG-7474 fix abschliessen data test id
---
.../abschliessen-button/abschliessen-button.component.html | 4 ++--
.../abschliessen-button.component.spec.ts | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index f9670cbee8..758515c533 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -28,7 +28,7 @@
@if (showAsIconButton) {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="abschliessen-icon-button"
+ dataTestId="abschliessen-icon-button"
tooltip="Vorgang abschließen"
variant="ghost"
size="fit"
@@ -39,7 +39,7 @@
} @else {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="abschliessen-button"
+ dataTestId="abschliessen-button"
text="Abschließen"
variant="outline"
(clickEmitter)="abschliessen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
index 964474db25..a7334741a0 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
@@ -29,7 +29,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { CheckIconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { Observable, of } from 'rxjs';
@@ -39,8 +39,8 @@ describe('AbschliessenButtonComponent', () => {
let component: AbschliessenButtonComponent;
let fixture: ComponentFixture<AbschliessenButtonComponent>;
- const abschliessenButton: string = getDataTestIdOf('abschliessen-button');
- const abschliessenIconButton: string = getDataTestIdOf('abschliessen-icon-button');
+ const abschliessenButton: string = getDataTestIdAttributeOf('abschliessen-button');
+ const abschliessenIconButton: string = getDataTestIdAttributeOf('abschliessen-icon-button');
const vorgangCommandService = {
...mock(VorgangCommandService),
--
GitLab
From af3b03471ac1134a9bced864942f8c9aadca4333 Mon Sep 17 00:00:00 2001
From: Alexander Reifschneider <alexander.reifschneider@mgm-tp.com>
Date: Tue, 11 Feb 2025 16:16:46 +0100
Subject: [PATCH 7/8] OZG-7474 Add more data test ids
---
.../zurueckstellen-button.component.html | 4 ++--
.../zurueckstellen-button.component.spec.ts | 6 +++---
.../erledigen-button-container.component.html | 2 +-
.../erledigen-button-container.component.spec.ts | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
index c595747b98..843b20963e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
@@ -28,7 +28,7 @@
@if (showAsIconButton) {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="zurueckstellen-icon-button"
+ dataTestId="zurueckstellen-icon-button"
tooltip="Vorgang zurückstellen"
variant="ghost"
size="fit"
@@ -39,7 +39,7 @@
} @else {
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
- data-test-id="zurueckstellen-button"
+ dataTestId="zurueckstellen-button"
text="Zurückstellen"
variant="outline"
(clickEmitter)="zurueckstellen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
index b17b7c5a7c..4f9a74edc4 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { UndoIconComponent } from '@ods/system';
import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
import { MockComponent } from 'ng-mocks';
import { of } from 'rxjs';
@@ -38,8 +38,8 @@ describe('ZurueckstellenButtonComponent', () => {
let component: ZurueckstellenButtonComponent;
let fixture: ComponentFixture<ZurueckstellenButtonComponent>;
- const zurueckstellenButton: string = getDataTestIdOf('zurueckstellen-button');
- const zurueckstellenIconButton: string = getDataTestIdOf('zurueckstellen-icon-button');
+ const zurueckstellenButton: string = getDataTestIdAttributeOf('zurueckstellen-button');
+ const zurueckstellenIconButton: string = getDataTestIdAttributeOf('zurueckstellen-icon-button');
const vorgangCommandService = {
...mock(VorgangCommandService),
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
index 5099a02204..71fb146636 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
@@ -25,7 +25,7 @@
-->
@if (wiedervorlage | hasLink: linkRel.ERLEDIGEN) {
<ods-button-with-spinner
- data-test-id="erledigen-icon-button"
+ dataTestId="erledigen-icon-button"
[stateResource]="erledigenCommand$ | async"
tooltip="Als erledigt markieren"
variant="ghost"
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
index 69aaf5f00d..81eec11065 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
@@ -27,6 +27,7 @@ import { WiedervorlageLinkRel, WiedervorlageService } from '@alfa-client/wiederv
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { CheckCircleIconComponent } from '@ods/system';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
import { MockComponent } from 'ng-mocks';
import { ErledigenButtonContainerComponent } from './erledigen-button-container.component';
@@ -35,7 +36,7 @@ describe('ErledigenButtonContainerComponent', () => {
let component: ErledigenButtonContainerComponent;
let fixture: ComponentFixture<ErledigenButtonContainerComponent>;
- const erledigenIconButton = '[data-test-id="erledigen-icon-button"]';
+ const erledigenIconButton = getDataTestIdAttributeOf('erledigen-icon-button');
const wiedervorlageService = mock(WiedervorlageService);
--
GitLab
From 7e7e392e680bc3a503f045196c09a775e5723c16 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Feb 2025 16:26:01 +0100
Subject: [PATCH 8/8] OZG-7474 fix test
---
.../zurueckholen-button/zurueckholen-button.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
index 4f41c6a5a1..d2ac600887 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
@@ -39,7 +39,7 @@
<ods-button-with-spinner
[stateResource]="commandStateResource$ | async"
dataTestId="zurueckholen-button"
- text="Vorgang zurückholen"
+ text="Zurückholen"
variant="outline"
(clickEmitter)="zurueckholen()"
>
--
GitLab