From 236971c2fc062e72ec9c8c7c4e7baaebea0d00f0 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Fri, 21 Feb 2025 17:23:42 +0100
Subject: [PATCH] OZG-6185 adjust data-test-id
---
...d-bescheid-versenden-senden.component.html | 2 +-
...escheid-versenden-senden.component.spec.ts | 4 +--
...escheid-versenden-speichern.component.html | 2 +-
...heid-versenden-speichern.component.spec.ts | 4 +--
.../bescheiden-button.component.html | 4 +--
.../bescheiden-button.component.spec.ts | 25 +++++++++++++++----
6 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.html
index 0631bc2d36..456fdbcb23 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.html
@@ -39,7 +39,7 @@
[stateResource]="submitStateResource$ | async"
text="Bescheid senden"
(clickEmitter)="submit()"
- data-test-id="send-button"
+ dataTestId="send-button"
></ods-button-with-spinner>
}
</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.spec.ts
index 9f90d5f49a..e605449d80 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/senden/bescheid-wizard-bescheid-versenden-senden.component.spec.ts
@@ -26,7 +26,7 @@ import { EMPTY, of } from 'rxjs';
import { BescheidService2 } from '../../../../../../../../bescheid-shared/src/lib/bescheid2.service';
import { createBescheidResource, createWizard } from '../../../../../../../../bescheid-shared/src/test/bescheid';
import { createSuccessfullyDoneCommandStateResource } from '../../../../../../../../command-shared/test/command';
-import { getDataTestIdOf } from '../../../../../../../../tech-shared/test/data-test';
+import { getDataTestIdAttributeOf, getDataTestIdOf } from '../../../../../../../../tech-shared/test/data-test';
import { createProblemDetail } from '../../../../../../../../tech-shared/test/error';
import { singleColdCompleted } from '../../../../../../../../tech-shared/test/marbles';
import { BescheidFormService } from '../../../../bescheid.formservice';
@@ -38,7 +38,7 @@ describe('BescheidWizardBescheidVersendenSendenComponent', () => {
let fixture: ComponentFixture<BescheidWizardBescheidVersendenSendenComponent>;
const dokumenteTestsId: string = getDataTestIdOf('bescheid-versenden-dokumente');
- const submitButtonTestId: string = getDataTestIdOf('send-button');
+ const submitButtonTestId: string = getDataTestIdAttributeOf('send-button');
const empfaengerTestId: string = getDataTestIdOf('bescheid-nachricht-empfaenger');
let bescheidService: Mock<BescheidService2>;
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.html b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.html
index a19c2b53db..28a81da1c3 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.html
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.html
@@ -14,7 +14,7 @@
[stateResource]="submitStateResource$ | async"
text="Antrag bescheiden und speichern"
(clickEmitter)="submit()"
- data-test-id="confirm-and-save-button"
+ dataTestId="confirm-and-save-button"
></ods-button-with-spinner>
}
</div>
diff --git a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.spec.ts b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.spec.ts
index 4382985e2f..40f0c44f14 100644
--- a/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.spec.ts
+++ b/alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard/bescheid-versenden/summary/speichern/bescheid-wizard-bescheid-versenden-speichern.component.spec.ts
@@ -23,7 +23,7 @@ import { MockComponent } from 'ng-mocks';
import { EMPTY, of } from 'rxjs';
import { createBescheidResource } from '../../../../../../../../bescheid-shared/src/test/bescheid';
import { createSuccessfullyDoneCommandStateResource } from '../../../../../../../../command-shared/test/command';
-import { getDataTestIdOf } from '../../../../../../../../tech-shared/test/data-test';
+import { getDataTestIdAttributeOf, getDataTestIdOf } from '../../../../../../../../tech-shared/test/data-test';
import { createProblemDetail } from '../../../../../../../../tech-shared/test/error';
import { singleColdCompleted } from '../../../../../../../../tech-shared/test/marbles';
import { BescheidFormService } from '../../../../bescheid.formservice';
@@ -36,7 +36,7 @@ describe('BescheidWizardBescheidVersendenSpeichernComponent', () => {
let fixture: ComponentFixture<BescheidWizardBescheidVersendenSpeichernComponent>;
const dokumenteTestsId: string = getDataTestIdOf('bescheid-versenden-dokumente');
- const submitButtonTestId: string = getDataTestIdOf('confirm-and-save-button');
+ const submitButtonTestId: string = getDataTestIdAttributeOf('confirm-and-save-button');
let formService: Mock<BescheidFormService>;
let dialogRef: Mock<DialogRef<BescheidWizardDialogResult>>;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
index b3464f415e..01e35c10b6 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.html
@@ -32,7 +32,7 @@
tooltipAriaType="aria-labelledby"
variant="ghost"
size="fit"
- data-test-id="bescheiden-icon-button"
+ dataTestId="bescheiden-icon-button"
>
<ods-stamp-icon icon class="fill-text" size="medium" />
</ods-button-with-spinner>
@@ -42,7 +42,7 @@
(clickEmitter)="bescheiden()"
[text]="buttonText"
variant="outline"
- data-test-id="bescheiden-button"
+ dataTestId="bescheiden-button"
>
<ods-stamp-icon icon size="medium" class="fill-primary" />
</ods-button-with-spinner>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
index 3db736ad9d..072f568bac 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bescheiden-button/bescheiden-button.component.spec.ts
@@ -25,16 +25,31 @@ import { BescheidWizardContainerComponent } from '@alfa-client/bescheid';
import { BescheidResource, BescheidService, BescheidWizardDialogResult } from '@alfa-client/bescheid-shared';
import { CommandResource } from '@alfa-client/command-shared';
import { createEmptyStateResource, createStateResource, HasLinkPipe, StateResource } from '@alfa-client/tech-shared';
-import { createDialogRefMock, DialogRefMock, getElementComponentFromFixtureByCss, getMockComponent, Mock, mock, notExistsAsHtmlElement, tooltipExistsWithText, triggerEvent, } from '@alfa-client/test-utils';
+import {
+ createDialogRefMock,
+ DialogRefMock,
+ getElementComponentFromFixtureByCss,
+ getMockComponent,
+ Mock,
+ mock,
+ notExistsAsHtmlElement,
+ tooltipExistsWithText,
+ triggerEvent,
+} from '@alfa-client/test-utils';
import { OzgcloudDialogService } from '@alfa-client/ui';
import { BescheidenDialogData } from '@alfa-client/vorgang-detail';
-import { VorgangCommandService, VorgangService, VorgangWithEingangLinkRel, VorgangWithEingangResource, } from '@alfa-client/vorgang-shared';
+import {
+ VorgangCommandService,
+ VorgangService,
+ VorgangWithEingangLinkRel,
+ VorgangWithEingangResource,
+} from '@alfa-client/vorgang-shared';
import { DialogRef } from '@angular/cdk/dialog';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ButtonWithSpinnerComponent } from '@ods/component';
import { StampIconComponent, 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 { Observable, of } from 'rxjs';
@@ -46,8 +61,8 @@ describe('BescheidenButtonComponent', () => {
let component: BescheidenButtonComponent;
let fixture: ComponentFixture<BescheidenButtonComponent>;
- const bescheidenButton: string = getDataTestIdOf('bescheiden-button');
- const bescheidenIconButton: string = getDataTestIdOf('bescheiden-icon-button');
+ const bescheidenButton: string = getDataTestIdAttributeOf('bescheiden-button');
+ const bescheidenIconButton: string = getDataTestIdAttributeOf('bescheiden-icon-button');
let vorgangCommandService: Mock<VorgangCommandService>;
let ozgcloudDialogService: Mock<OzgcloudDialogService>;
--
GitLab