diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts index 7faaca7531342e39bed17145ca23f50a27974bd5..d5814a551c15475c3a9b9ca7923dec353a5461d2 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts @@ -6,9 +6,9 @@ import { notExistsAsHtmlElement, } from '@alfa-client/test-utils'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ButtonComponent, CollaborationIconComponent, SaveIconComponent } from '@ods/system'; +import { ButtonComponent, CollaborationIconComponent } from '@ods/system'; import { CollaborationService } from 'libs/collaboration-shared/src/lib/collaboration.service'; -import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; +import { getDataTestIdAttributeOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test'; import { MockComponent } from 'ng-mocks'; import { of } from 'rxjs'; import { CollaborationInVorgangContainerComponent } from './collaboration-in-vorgang-container.component'; @@ -18,7 +18,7 @@ describe('CollaborationInVorgangContainerComponent', () => { let component: CollaborationInVorgangContainerComponent; let fixture: ComponentFixture<CollaborationInVorgangContainerComponent>; - const anfrageErstellenButton: string = getDataTestIdOf('anfrage-erstellen-button'); + const anfrageErstellenButton: string = getDataTestIdAttributeOf('anfrage-erstellen-button'); const collaborationRequestContainer: string = getDataTestIdOf('collaboration-request-container'); const service: Mock<CollaborationService> = { @@ -28,9 +28,9 @@ describe('CollaborationInVorgangContainerComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ButtonComponent, SaveIconComponent], declarations: [ CollaborationInVorgangContainerComponent, + MockComponent(ButtonComponent), MockComponent(CollaborationRequestContainerComponent), MockComponent(CollaborationIconComponent), ], @@ -74,7 +74,7 @@ describe('CollaborationInVorgangContainerComponent', () => { it('should call service on click', () => { fixture.detectChanges(); - dispatchEventFromFixture(fixture, anfrageErstellenButton, 'click'); + dispatchEventFromFixture(fixture, anfrageErstellenButton, 'clickEmitter'); expect(service.showRequestForm).toHaveBeenCalled(); }); diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-container/collaboration-request-container.component.spec.ts b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-container/collaboration-request-container.component.spec.ts index 074ae43ab3906ee484667f9640f1027954996636..9cac3e35dd60643ff6dbfe8f61a33bee1a83e634 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-container/collaboration-request-container.component.spec.ts +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-request-container/collaboration-request-container.component.spec.ts @@ -2,7 +2,7 @@ import { dispatchEventFromFixture } from '@alfa-client/test-utils'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ButtonComponent, CloseIconComponent } from '@ods/system'; import { SearchIconComponent } from 'libs/design-system/src/lib/icons/search-icon/search-icon.component'; -import { getDataTestIdOf } from 'libs/tech-shared/test/data-test'; +import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test'; import { MockComponent } from 'ng-mocks'; import { CollaborationRequestContainerComponent } from './collaboration-request-container.component'; import { CollaborationRequestFormComponent } from './collaboration-request-form/collaboration-request-form.component'; @@ -11,13 +11,13 @@ describe('CollaborationRequestContainerComponent', () => { let component: CollaborationRequestContainerComponent; let fixture: ComponentFixture<CollaborationRequestContainerComponent>; - const cancelButton: string = getDataTestIdOf('collaboration-request-cancel-button'); + const cancelButton: string = getDataTestIdAttributeOf('collaboration-request-cancel-button'); beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ButtonComponent], declarations: [ CollaborationRequestContainerComponent, + MockComponent(ButtonComponent), MockComponent(SearchIconComponent), MockComponent(CloseIconComponent), MockComponent(CollaborationRequestFormComponent), @@ -37,7 +37,7 @@ describe('CollaborationRequestContainerComponent', () => { it('should emit hideRequestForm', () => { const emitSpy = (component.hideRequestForm.emit = jest.fn()); - dispatchEventFromFixture(fixture, cancelButton, 'click'); + dispatchEventFromFixture(fixture, cancelButton, 'clickEmitter'); expect(emitSpy).toHaveBeenCalled(); }); diff --git a/alfa-client/libs/tech-shared/test/data-test.ts b/alfa-client/libs/tech-shared/test/data-test.ts index d0c53e43d65c6547e211bce4ac0ef9bfb887b9b4..4b4b9cc2b8a1661880fbe10002e8d1b3a0a02c7a 100644 --- a/alfa-client/libs/tech-shared/test/data-test.ts +++ b/alfa-client/libs/tech-shared/test/data-test.ts @@ -28,3 +28,7 @@ export function getDataTestClassOf(value: string): string { export function getDataTestIdOf(value: string): string { return `[data-test-id="${value}"]`; } + +export function getDataTestIdAttributeOf(value: string): string { + return `[dataTestId="${value}"]`; +}